syscontaienr-tools: static compilation for cross-version use
Signed-off-by: yangjiaqi <yangjiaqi16@huawei.com> (cherry picked from commit e555d8dcfc89d7b9855516c928345d23fb98e29b)
This commit is contained in:
parent
cc465b706e
commit
54dbbe1df4
26
0011-static-compilation-for-cross-version-use.patch
Normal file
26
0011-static-compilation-for-cross-version-use.patch
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
From 8de2df7665017e851b319056170dc367edf2b017 Mon Sep 17 00:00:00 2001
|
||||||
|
From: yangjiaqi <yangjiaqi16@huawei.com>
|
||||||
|
Date: Fri, 10 May 2024 15:28:22 +0800
|
||||||
|
Subject: [PATCH] static compilation for cross-version use
|
||||||
|
|
||||||
|
Signed-off-by: vegbir <yangjiaqi16@huawei.com>
|
||||||
|
---
|
||||||
|
Makefile | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/Makefile b/Makefile
|
||||||
|
index c750d94..d3b3af3 100644
|
||||||
|
--- a/Makefile
|
||||||
|
+++ b/Makefile
|
||||||
|
@@ -20,7 +20,7 @@ VERSION := $(shell cat ./VERSION)
|
||||||
|
BEP_DIR=/tmp/syscontainer-tools-build-bep
|
||||||
|
BEP_FLAGS=-tmpdir=/tmp/syscontainer-tools-build-bep
|
||||||
|
|
||||||
|
-GO_LDFLAGS="-buildid=IdByiSula $(BEP_FLAGS) -linkmode=external -extldflags=-static -extldflags=-Wl,-z,relro,-z,now -X main.gitCommit=${COMMIT} -X main.version=${VERSION}"
|
||||||
|
+GO_LDFLAGS='-buildid=IdByiSula $(BEP_FLAGS) -linkmode=external -extldflags "-static-pie -Wl,-z,relro,-z,now" -X main.gitCommit=${COMMIT} -X main.version=${VERSION}'
|
||||||
|
|
||||||
|
ENV = GOPATH=${GOPATH} \
|
||||||
|
CGO_ENABLED=1 \
|
||||||
|
--
|
||||||
|
2.33.0
|
||||||
|
|
||||||
@ -1,7 +1,7 @@
|
|||||||
#Basic Information
|
#Basic Information
|
||||||
Name: syscontainer-tools
|
Name: syscontainer-tools
|
||||||
Version: 0.9
|
Version: 0.9
|
||||||
Release: 64
|
Release: 65
|
||||||
Summary: syscontainer tools for IT, work with iSulad
|
Summary: syscontainer tools for IT, work with iSulad
|
||||||
License: Mulan PSL v2
|
License: Mulan PSL v2
|
||||||
URL: https://gitee.com/openeuler/syscontainer-tools
|
URL: https://gitee.com/openeuler/syscontainer-tools
|
||||||
@ -18,6 +18,7 @@ Patch7: 0007-use-file-locks-to-avoid-remounting-the-sharepath-mas.patch
|
|||||||
Patch8: 0008-clean-up-run-syscontainer-tools-netns-containerid-di.patch
|
Patch8: 0008-clean-up-run-syscontainer-tools-netns-containerid-di.patch
|
||||||
Patch9: 0009-drop-useless-function-error-and-info.patch
|
Patch9: 0009-drop-useless-function-error-and-info.patch
|
||||||
Patch10: 0010-fix-log-of-removeUdevRule.patch
|
Patch10: 0010-fix-log-of-removeUdevRule.patch
|
||||||
|
Patch11: 0011-static-compilation-for-cross-version-use.patch
|
||||||
|
|
||||||
%ifarch sw_64
|
%ifarch sw_64
|
||||||
Patch1000: 1000-add-sw_64-support-not-upstream-modified-files.patch
|
Patch1000: 1000-add-sw_64-support-not-upstream-modified-files.patch
|
||||||
@ -126,6 +127,12 @@ chmod 0640 ${HOOK_SPEC}/hookspec.json
|
|||||||
rm -rfv %{buildroot}
|
rm -rfv %{buildroot}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri May 10 2024 yangjiaqi <yangjiaqi16@huawei.com> - 0.9-65
|
||||||
|
- Type:bugfix
|
||||||
|
- CVE:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:static compilation for cross-version use
|
||||||
|
|
||||||
* Mon Mar 11 2024 zhangxianting <zhangxianting@uniontech.com> - 0.9-64
|
* Mon Mar 11 2024 zhangxianting <zhangxianting@uniontech.com> - 0.9-64
|
||||||
- Type:patch
|
- Type:patch
|
||||||
- CVE:NA
|
- CVE:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user