packages/isula-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!297 [sync] PR-296: fix the problem that it failed when applying patches in RISCV architecture

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @daishitou, @jingxiaolu 
Signed-off-by: @jingxiaolu
This commit is contained in:
openeuler-ci-bot 2024-04-07 01:48:35 +00:00 committed by Gitee
commit f2e67753ac
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION-vendor
View File

@ -1 +1 @@
0.9.6-20 0.9.6-22

2
git-commit
View File

@ -1 +1 @@
95b999499ce3a99101bab07e03a95e8eaf792288 905f1e209d1dffd819a521635acb0eaf270bcd69

10
isula-build.spec
View File

@ -2,7 +2,7 @@
Name: isula-build Name: isula-build
Version: 0.9.6 Version: 0.9.6
Release: 21 Release: 22
Summary: A tool to build container images Summary: A tool to build container images
License: Mulan PSL V2 License: Mulan PSL V2
URL: https://gitee.com/openeuler/isula-build URL: https://gitee.com/openeuler/isula-build
@ -102,7 +102,13 @@ fi
/usr/share/bash-completion/completions/isula-build /usr/share/bash-completion/completions/isula-build
%changelog %changelog
* Thu Feb 22 2024 luofng <luofeng13@huawei.com> - 0.9.6-21 * Mon Apr 1 2024 luofeng <luofeng13@huawei.com> - 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 <luofeng13@huawei.com> - 0.9.6-21
- Type: enhencement - Type: enhencement
- CVE:NA - CVE:NA
- SUG:NA - SUG:NA

2
patch/loong64-0003-delete-static-pie-for-loong64.patch
View File

@ -14,7 +14,7 @@ index 0d6bd01..889b610 100644
@@ -23,7 +23,7 @@ BUILDFLAGS := -tags "$(BUILDTAGS)" @@ -23,7 +23,7 @@ BUILDFLAGS := -tags "$(BUILDTAGS)"
TMPDIR := /tmp/isula_build_tmpdir TMPDIR := /tmp/isula_build_tmpdir
BEFLAG := -tmpdir=${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 "-static-pie -Wl,-z,now"
+STATIC_LDFLAGS := -linkmode=external -extldflags "-Wl,-z,now" +STATIC_LDFLAGS := -linkmode=external -extldflags "-Wl,-z,now"