diff --git a/VERSION-vendor b/VERSION-vendor index ce3de2f..b50464e 100644 --- a/VERSION-vendor +++ b/VERSION-vendor @@ -1 +1 @@ -0.9.6-20 +0.9.6-22 diff --git a/git-commit b/git-commit index aa8f0ca..becf69a 100644 --- a/git-commit +++ b/git-commit @@ -1 +1 @@ -95b999499ce3a99101bab07e03a95e8eaf792288 +905f1e209d1dffd819a521635acb0eaf270bcd69 diff --git a/isula-build.spec b/isula-build.spec index 2dfaf22..9460ee6 100644 --- a/isula-build.spec +++ b/isula-build.spec @@ -2,7 +2,7 @@ Name: isula-build Version: 0.9.6 -Release: 21 +Release: 22 Summary: A tool to build container images License: Mulan PSL V2 URL: https://gitee.com/openeuler/isula-build @@ -102,7 +102,13 @@ fi /usr/share/bash-completion/completions/isula-build %changelog -* Thu Feb 22 2024 luofng - 0.9.6-21 +* Mon Apr 1 2024 luofeng - 0.9.6-22 +- Type: bugfix +- CVE:NA +- SUG:NA +- DESC:fix the problem that it failed when applying patches in RISCV architecture + +* Thu Feb 22 2024 luofeng - 0.9.6-21 - Type: enhencement - CVE:NA - SUG:NA diff --git a/patch/loong64-0003-delete-static-pie-for-loong64.patch b/patch/loong64-0003-delete-static-pie-for-loong64.patch index bc887f3..3b0f6f8 100644 --- a/patch/loong64-0003-delete-static-pie-for-loong64.patch +++ b/patch/loong64-0003-delete-static-pie-for-loong64.patch @@ -14,7 +14,7 @@ index 0d6bd01..889b610 100644 @@ -23,7 +23,7 @@ BUILDFLAGS := -tags "$(BUILDTAGS)" TMPDIR := /tmp/isula_build_tmpdir BEFLAG := -tmpdir=${TMPDIR} - SAFEBUILDFLAGS := -buildid=IdByIsula -buildmode=pie -extldflags=-ftrapv -extldflags=-zrelro -extldflags=-znow $(BEFLAG) $(LDFLAGS) + SAFEBUILDFLAGS := -buildid=IdByIsula -buildmode=pie -extldflags=-ftrapv -extldflags=-Wl,-z,relro -extldflags=-Wl,-z,now $(BEFLAG) $(LDFLAGS) -STATIC_LDFLAGS := -linkmode=external -extldflags "-static-pie -Wl,-z,now" +STATIC_LDFLAGS := -linkmode=external -extldflags "-Wl,-z,now"