diff --git a/kata-integration.spec b/kata-integration.spec index 6126e05054379faf343899902a5dd819fc5b29cc..c12c9473cd3054c15f9bdc05ff0230f5ac99e15c 100644 --- a/kata-integration.spec +++ b/kata-integration.spec @@ -1,6 +1,6 @@ %global debug_package %{nil} %define VERSION v1.0.0 -%define RELEASE 3 +%define RELEASE 4 Name: kata-integration Version: %{VERSION} @@ -28,6 +28,12 @@ This is a usefult tool for building Kata Container components. %doc %changelog +* Sat Nov 27 2021 yangfeiyu - 1.0.0-4 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC:build shimv2 + * Sat Sep 5 2020 jiangpengf - 1.0.0-3 - Type:enhancement - ID:NA diff --git a/patches/0003-open-containerd-kata-shimv2-build-flag.patch b/patches/0003-open-containerd-kata-shimv2-build-flag.patch new file mode 100644 index 0000000000000000000000000000000000000000..4315c186165cc69342aa9beec6c9f9a1bc385aeb --- /dev/null +++ b/patches/0003-open-containerd-kata-shimv2-build-flag.patch @@ -0,0 +1,40 @@ +From 6459848ee40762c9f28cb3ff4afad5b3b4e8c8e0 Mon Sep 17 00:00:00 2001 +From: gaohuatao +Date: Wed, 28 Apr 2021 16:39:36 +0800 +Subject: [PATCH] open containerd kata shimv2 build flag + +reason: open containerd kata shimv2 build flag + +Signed-off-by: gaohuatao +--- + Makefile | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/Makefile b/Makefile +index f22fc80..beb46b6 100644 +--- a/Makefile ++++ b/Makefile +@@ -35,6 +35,7 @@ runtime: agent + sh ./scripts/make_default_configuration.sh $(RUNTIME_PATH) + cp -f $(RUNTIME_PATH)/kata-runtime $(BUILD_PATH)/ + cp -f $(RUNTIME_PATH)/kata-netmon $(BUILD_PATH)/ ++ cp -f $(RUNTIME_PATH)/containerd-shim-kata-v2 $(BUILD_PATH)/ + + proxy: + cd proxy; sh apply-patches +@@ -69,6 +70,7 @@ install: + install -p -m 750 $(BUILD_PATH)/kata-runtime /usr/bin/ + install -p -m 750 $(BUILD_PATH)/kata-proxy /usr/bin/ + install -p -m 750 $(BUILD_PATH)/kata-shim /usr/bin/ ++ install -p -m 750 $(BUILD_PATH)/containerd-shim-kata-v2 /usr/bin/ + install -p -m 640 -D $(RUNTIME_PATH)/cli/config/configuration-qemu.toml usr/share/defaults/kata-containers/configuration.toml + + clean: +@@ -78,3 +80,4 @@ clean: + rm -f $(BUILD_PATH)/busybox + rm -f $(BUILD_PATH)/kata-runtime + rm -f $(BUILD_PATH)/kata-agent ++ rm -f $(BUILD_PATH)/containerd-shim-kata-v2 +-- +2.20.1 + diff --git a/series.conf b/series.conf index d81165414f0661ce175ace32804a68b61cdd6bf7..c331da039e18ab1e4de8c242ded7948c2cd95bb2 100644 --- a/series.conf +++ b/series.conf @@ -1,2 +1,3 @@ 0001-kata-containers-disable-netmon-by-default.patch 0002-kata_integration-modify-kernel-config-x86.patch +0003-open-containerd-kata-shimv2-build-flag.patch