From f9acced41cf046ac840381342d9267c80e8790c7 Mon Sep 17 00:00:00 2001 From: holyfei Date: Mon, 7 Mar 2022 11:51:38 +0800 Subject: [PATCH] kata_integration: modify x86 kata micro kernel config reason: modify x86 kata micro kernel config Signed-off-by: holyfei (cherry picked from commit 69ebf4163433c25b481921059df933c0f07d67cb) --- kata-integration.spec | 8 ++++- ...-modify-x86-kernel-config-for-kata-m.patch | 29 +++++++++++++++++++ series.conf | 1 + 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 patches/0005-kata_integration-modify-x86-kernel-config-for-kata-m.patch diff --git a/kata-integration.spec b/kata-integration.spec index de2e02f..0195441 100644 --- a/kata-integration.spec +++ b/kata-integration.spec @@ -1,6 +1,6 @@ %global debug_package %{nil} %define VERSION v1.0.0 -%define RELEASE 6 +%define RELEASE 7 Name: kata-integration Version: %{VERSION} @@ -28,6 +28,12 @@ This is a usefult tool for building Kata Container components. %doc %changelog +* Mon Mar 7 2022 yangfeiyu - 1.0.0-7 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:modify x86 kata micro kernel config + * Tue Aug 24 2021 jikui - 1.0.0-6 - Type:enhancement - ID:NA diff --git a/patches/0005-kata_integration-modify-x86-kernel-config-for-kata-m.patch b/patches/0005-kata_integration-modify-x86-kernel-config-for-kata-m.patch new file mode 100644 index 0000000..e4fbedb --- /dev/null +++ b/patches/0005-kata_integration-modify-x86-kernel-config-for-kata-m.patch @@ -0,0 +1,29 @@ +From c45eeb0d37174628df461593549ece9489ab7d69 Mon Sep 17 00:00:00 2001 +From: holyfei +Date: Mon, 7 Mar 2022 11:48:43 +0800 +Subject: [PATCH] kata_integration: modify x86 kernel config for kata micro + kernel + +reason: modify x86 kernel config for kata micro kernel + +Signed-off-by: holyfei +--- + hack/config-kata-x86_64 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/hack/config-kata-x86_64 b/hack/config-kata-x86_64 +index 69302d7..b64e683 100644 +--- a/hack/config-kata-x86_64 ++++ b/hack/config-kata-x86_64 +@@ -363,7 +363,7 @@ CONFIG_X86_SMAP=y + CONFIG_X86_INTEL_UMIP=y + # CONFIG_X86_INTEL_MPX is not set + CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y +-# CONFIG_EFI is not set ++CONFIG_EFI=y + CONFIG_SECCOMP=y + # CONFIG_HZ_100 is not set + # CONFIG_HZ_250 is not set +-- +2.27.0 + diff --git a/series.conf b/series.conf index 6343d25..624bb08 100644 --- a/series.conf +++ b/series.conf @@ -2,3 +2,4 @@ 0002-kata_integration-adapt-with-new-kata-containers.patch 0003-kata_integration-modify-kernel-config-for-kata.patch 0004-kata_integration-modify-x86_64-kernel-config-for-kat.patch +0005-kata_integration-modify-x86-kernel-config-for-kata-m.patch -- Gitee