Fix #I4KI81 reason: modify kata-containers version and update it to 1.11.1 Signed-off-by: holyfei <yangfeiyu20092010@163.com>
30 lines
938 B
Diff
30 lines
938 B
Diff
From 1c7aaafa7b8691ea6ed6c910455567b36bb6f5ff Mon Sep 17 00:00:00 2001
|
|
From: jikui <jikui2@huawei.com>
|
|
Date: Thu, 18 Mar 2021 15:25:49 +0800
|
|
Subject: [PATCH] kata-agent: modify make flags
|
|
|
|
reason: modify make flags
|
|
|
|
Signed-off-by: jikui <jikui2@huawei.com>
|
|
---
|
|
Makefile | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index e4fd243..26fe898 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -101,6 +101,9 @@ AGENT_IMAGE := katacontainers/agent-dev
|
|
AGENT_TAG := $(if $(COMMIT_NO_SHORT),$(COMMIT_NO_SHORT),dev)
|
|
|
|
$(TARGET): $(GENERATED_FILES) $(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) -tags "$(BUILDTAGS)" -o $@ \
|
|
-ldflags "-X main.version=$(VERSION_COMMIT) -X main.seccompSupport=$(SECCOMP) $(LDFLAGS) $(KATA_LDFLAGS)"
|
|
|
|
--
|
|
2.25.1
|
|
|