diff --git a/agent/patches/0020-kata-agent-add-linkmode-to-resolve-build-error.patch b/agent/patches/0020-kata-agent-add-linkmode-to-resolve-build-error.patch new file mode 100644 index 0000000000000000000000000000000000000000..e60ae635fcf6470d1294fd6671e27331f5075b03 --- /dev/null +++ b/agent/patches/0020-kata-agent-add-linkmode-to-resolve-build-error.patch @@ -0,0 +1,37 @@ +From d98995f25c3a839f25590478bef37d2a456593a3 Mon Sep 17 00:00:00 2001 +From: jikui +Date: Mon, 22 Mar 2021 17:07:37 +0800 +Subject: [PATCH] kata-agent: add linkmode to resolve build error + +reason: add linkmode to resolve build error + +Signed-off-by: jikui +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 26fe898..5401c69 100644 +--- a/Makefile ++++ b/Makefile +@@ -16,7 +16,7 @@ INIT := no + TRACE := no + + # Set to "yes“ if binary stripping is needed. +-STRIP := no ++STRIP := yes + + # Tracing cannot currently be supported when running the agent as PID 1 since + # the tracing requires additional services to be started _before_ the agent +@@ -105,7 +105,7 @@ $(TARGET): $(GENERATED_FILES) $(SOURCES) $(VERSION_FILE) + CGO_LDFLAGS_ALLOW="-Wl,-z,relro,-z,now" \ + CGO_LDFLAGS="-Wl,-z,relro,-z,now -Wl,-z,noexecstack" \ + go build $(BUILDFLAGS) -tags "$(BUILDTAGS)" -o $@ \ +- -ldflags "-X main.version=$(VERSION_COMMIT) -X main.seccompSupport=$(SECCOMP) $(LDFLAGS) $(KATA_LDFLAGS)" ++ -ldflags "-linkmode=external -X main.version=$(VERSION_COMMIT) -X main.seccompSupport=$(SECCOMP) $(LDFLAGS) $(KATA_LDFLAGS)" + + install: $(TARGET) + install -D $(TARGET) $(DESTDIR)$(BINDIR)/$(TARGET) +-- +2.25.1 + diff --git a/agent/series.conf b/agent/series.conf index 732fc3f0b4daf9b5fd44790cef269af735afad2d..6f69da3c82ce383035084132dae5bfa6b90c777a 100644 --- a/agent/series.conf +++ b/agent/series.conf @@ -17,3 +17,4 @@ 0017-agent-add-support-of-new-sandbox-StratoVirt.patch 0018-kata-agent-update-nic-in-guest.patch 0019-kata-agent-modify-make-flags.patch +0020-kata-agent-add-linkmode-to-resolve-build-error.patch diff --git a/kata-containers.spec b/kata-containers.spec index 79299ff5e43fa0eed1cc163d0ea22a8a00c704c9..73ceaa0ee26e31e9db458037f039cc8609759bcd 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -2,7 +2,7 @@ %global debug_package %{nil} %define VERSION v1.11.1 -%define RELEASE 11 +%define RELEASE 12 Name: kata-containers Version: %{VERSION} @@ -91,6 +91,12 @@ install -p -m 640 -D ./runtime/cli/config/configuration-qemu.toml %{buildroot}/u %changelog +* Mon Mar 22 2021 jikui - 1.11.1-12 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC:add linkmode to resolve build error + * Thu Mar 17 2021 jikui - 1.11.1-11 - Type:enhancement - ID:NA diff --git a/proxy/patches/0003-kata-proxy-add-linkmode-to-resolve-build-error.patch b/proxy/patches/0003-kata-proxy-add-linkmode-to-resolve-build-error.patch new file mode 100644 index 0000000000000000000000000000000000000000..b3b840ea1dc1152e1a04c81cc26d352e9b260fd2 --- /dev/null +++ b/proxy/patches/0003-kata-proxy-add-linkmode-to-resolve-build-error.patch @@ -0,0 +1,37 @@ +From 5c4d7bcbef7d213009f1c63acf53319e230e06e2 Mon Sep 17 00:00:00 2001 +From: jikui +Date: Mon, 22 Mar 2021 17:11:48 +0800 +Subject: [PATCH] kata-proxy: add linkmode to resolve build error + +reason: add linkmode to resolve build error + +Signed-off-by: jikui +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 07e9ba8..b931dd3 100644 +--- a/Makefile ++++ b/Makefile +@@ -5,7 +5,7 @@ + # + + # Set to "yes“ if binary stripping is needed. +-STRIP := no ++STRIP := yes + + DESTDIR := + ifeq ($(PREFIX),) +@@ -36,7 +36,7 @@ $(TARGET): $(SOURCES) $(VERSION_FILE) + CGO_CFLAGS="-fstack-protector-strong -fPIE -D_FORTIFY_SOURCE=2 -O2" \ + CGO_LDFLAGS_ALLOW="-Wl,-z,relro,-z,now" \ + CGO_LDFLAGS="-Wl,-z,relro,-z,now -Wl,-z,noexecstack" \ +- go build $(BUILDFLAGS) -o $@ -ldflags "-X main.version=$(VERSION_COMMIT) $(KATA_LDFLAGS)" ++ go build $(BUILDFLAGS) -o $@ -ldflags "-linkmode=external -X main.version=$(VERSION_COMMIT) $(KATA_LDFLAGS)" + + test: + bash .ci/go-test.sh +-- +2.25.1 + diff --git a/proxy/series.conf b/proxy/series.conf index c798bb51f15770aa2ce4aa7761e9566f5675763e..669d8caacb8579544d83c2fdcbb7bc5b1ac3d368 100644 --- a/proxy/series.conf +++ b/proxy/series.conf @@ -1,2 +1,3 @@ 0001-clock-synchronizes-clock-info-to-agent.patch 0002-kata-proxy-modify-make-flags.patch +0003-kata-proxy-add-linkmode-to-resolve-build-error.patch diff --git a/runtime/patches/0069-kata-runtime-add-linkmode-to-resolve-build-error.patch b/runtime/patches/0069-kata-runtime-add-linkmode-to-resolve-build-error.patch new file mode 100644 index 0000000000000000000000000000000000000000..b75ef97eae336222eaa6cefe730a813f4059c4a5 --- /dev/null +++ b/runtime/patches/0069-kata-runtime-add-linkmode-to-resolve-build-error.patch @@ -0,0 +1,48 @@ +From 22678612f668274ab0b37175517401039e17ff00 Mon Sep 17 00:00:00 2001 +From: jikui +Date: Mon, 22 Mar 2021 17:18:14 +0800 +Subject: [PATCH] kata-runtime: add linkmode to resolve build error + +reason: add linkmode to resolve build error + +Signed-off-by: jikui +--- + Makefile | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index 6b9f764..f7a9311 100644 +--- a/Makefile ++++ b/Makefile +@@ -490,8 +490,9 @@ endif + BUILDFLAGS := -buildmode=pie ${BUILDTAGS} + + # whether stipping the binary ++STRIP=yes + ifeq ($(STRIP),yes) +- KATA_LDFLAGS := -ldflags "-w -s" ++ KATA_LDFLAGS := -ldflags "-w -s" + endif + + # Return non-empty string if specified directory exists +@@ -525,7 +526,7 @@ $(NETMON_TARGET_OUTPUT): $(SOURCES) VERSION + CGO_CFLAGS="-fstack-protector-strong -fPIE -D_FORTIFY_SOURCE=2 -O2" \ + CGO_LDFLAGS_ALLOW="-Wl,-z,relro,-z,now" \ + CGO_LDFLAGS="-Wl,-z,relro,-z,now -Wl,-z,noexecstack" \ +- go build $(BUILDFLAGS) -o $@ -ldflags "-X main.version=$(VERSION)" $(KATA_LDFLAGS)) ++ go build $(BUILDFLAGS) -o $@ -ldflags "-linkmode=external -X main.version=$(VERSION) -w -s") + + runtime: $(TARGET_OUTPUT) $(CONFIGS) + .DEFAULT: default +@@ -567,7 +568,7 @@ $(TARGET_OUTPUT): $(SOURCES) $(GENERATED_FILES) $(MAKEFILE_LIST) | show-summary + CGO_CFLAGS="-fstack-protector-strong -fPIE -D_FORTIFY_SOURCE=2 -O2" \ + CGO_LDFLAGS_ALLOW="-Wl,-z,relro,-z,now" \ + CGO_LDFLAGS="-Wl,-z,relro,-z,now -Wl,-z,noexecstack" \ +- go build $(KATA_LDFLAGS) $(BUILDFLAGS) -o $@ .) ++ go build $(KATA_LDFLAGS) $(BUILDFLAGS) -o $@ -ldflags "-linkmode=external" .) + + $(SHIMV2_OUTPUT): $(SOURCES) $(GENERATED_FILES) $(MAKEFILE_LIST) + $(QUIET_BUILD)(cd $(SHIMV2_DIR)/ && go build $(KATA_LDFLAGS) -i -o $@ .) +-- +2.25.1 + diff --git a/runtime/series.conf b/runtime/series.conf index 78b2c57015f682a2d3878dd16cadc984f118a60d..a1038d9a88266d6210e0cfee57caca19f94831e3 100644 --- a/runtime/series.conf +++ b/runtime/series.conf @@ -66,3 +66,4 @@ 0066-CVE-2020-28914-1.patch 0067-CVE-2020-28914-2.patch 0068-kata-runtime-modify-make-flags.patch +0069-kata-runtime-add-linkmode-to-resolve-build-error.patch diff --git a/shim/patches/0003-kata-shim-add-linkmode-to-resolve-build-error.patch b/shim/patches/0003-kata-shim-add-linkmode-to-resolve-build-error.patch new file mode 100644 index 0000000000000000000000000000000000000000..3a9b95d10e9229688e4ea267f61c331edf16cb2f --- /dev/null +++ b/shim/patches/0003-kata-shim-add-linkmode-to-resolve-build-error.patch @@ -0,0 +1,37 @@ +From 68290317bc35b3420506f0e25d7fccbdb9f88f5f Mon Sep 17 00:00:00 2001 +From: jikui +Date: Mon, 22 Mar 2021 17:21:10 +0800 +Subject: [PATCH] kata-shim: add linkmode to resolve build error + +reason: add linkmode to resolve build error + +Signed-off-by: jikui +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index b244053..70d4a8d 100644 +--- a/Makefile ++++ b/Makefile +@@ -5,7 +5,7 @@ + # + + # Set to "yes“ if binary stripping is needed. +-STRIP := no ++STRIP := yes + + DESTDIR := + ifeq ($(PREFIX),) +@@ -36,7 +36,7 @@ $(TARGET): $(SOURCES) $(VERSION_FILE) + CGO_CFLAGS="-fstack-protector-strong -fPIE -D_FORTIFY_SOURCE=2 -O2" \ + CGO_LDFLAGS_ALLOW="-Wl,-z,relro,-z,now" \ + CGO_LDFLAGS="-Wl,-z,relro,-z,now -Wl,-z,noexecstack" \ +- go build $(BUILDFLAGS) -o $@ -ldflags "-X main.version=$(VERSION_COMMIT) $(KATA_LDFLAGS)" ++ go build $(BUILDFLAGS) -o $@ -ldflags "-linkmode=external -X main.version=$(VERSION_COMMIT) $(KATA_LDFLAGS)" + + test: + @echo "Go tests using faketty" +-- +2.25.1 + diff --git a/shim/series.conf b/shim/series.conf index f9a1be03aba421f8814c59dda0805e0be828877f..3508352a344f963d5143b4798e586df04fdadc34 100644 --- a/shim/series.conf +++ b/shim/series.conf @@ -1,2 +1,3 @@ 0001-kata-shim-fix-kata-shim-process-wait-long-tim.patch 0002-kata-shim-modify-make-flags.patch +0003-kata-shim-add-linkmode-to-resolve-build-error.patch