From 3c9888154c2e6473307e0bcb628c6e5224bbfde5 Mon Sep 17 00:00:00 2001 From: xiadanni Date: Thu, 18 Mar 2021 16:00:06 +0800 Subject: [PATCH] runc: do not use -i in go build Signed-off-by: xiadanni --- .../0125-runc-compile-option-compliance.patch | 2 +- runc-openeuler.spec | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) rename 0125-runc-compile-option-compliance.patch => patch/0125-runc-compile-option-compliance.patch (92%) diff --git a/0125-runc-compile-option-compliance.patch b/patch/0125-runc-compile-option-compliance.patch similarity index 92% rename from 0125-runc-compile-option-compliance.patch rename to patch/0125-runc-compile-option-compliance.patch index bd56480..281e4bc 100644 --- a/0125-runc-compile-option-compliance.patch +++ b/patch/0125-runc-compile-option-compliance.patch @@ -29,7 +29,7 @@ index 43d15bf..fcf34ea 100644 + CGO_CPPFLAGS="-fstack-protector-strong -fPIE" \ + CGO_LDFLAGS_ALLOW='-Wl,-z,relro,-z,now' \ + CGO_LDFLAGS="-Wl,-z,relro,-z,now -Wl,-z,noexecstack" \ -+ go build -buildmode=pie -i -tags "$(BUILDTAGS) cgo static_build" -ldflags '-extldflags=-static' -ldflags $(LD_FLAGS) -o runc . ++ go build -buildmode=pie -tags "$(BUILDTAGS) cgo static_build" -ldflags '-extldflags=-static' -ldflags $(LD_FLAGS) -o runc . release: @flag_list=(seccomp selinux apparmor static); \ diff --git a/runc-openeuler.spec b/runc-openeuler.spec index 5bd8cfe..4241e43 100644 --- a/runc-openeuler.spec +++ b/runc-openeuler.spec @@ -4,7 +4,7 @@ Name: docker-runc Version: 1.0.0.rc3 -Release: 112 +Release: 113 Summary: runc is a CLI tool for spawning and running containers according to the OCI specification. License: ASL 2.0 @@ -52,6 +52,12 @@ install -p -m 755 runc $RPM_BUILD_ROOT/%{_bindir}/runc %{_bindir}/runc %changelog +* Thu Mar 18 2021 xiadanni - 1.0.0.rc3-113 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:do not use -i in go build + * Thu Mar 18 2021 xiadanni - 1.0.0.rc3-112 - Type:bugfix - CVE:NA -- Gitee