From 1fd4a579b2e98d499170bad15deb3a500b713c57 Mon Sep 17 00:00:00 2001 From: gaowei Date: Wed, 25 Aug 2021 06:41:04 +0000 Subject: [PATCH] kata_integration: modify x86_64 kernel config for kata --- kata-integration.spec | 8 ++++- ...-modify-x86_64-kernel-config-for-kat.patch | 29 +++++++++++++++++++ series.conf | 1 + 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 patches/0004-kata_integration-modify-x86_64-kernel-config-for-kat.patch diff --git a/kata-integration.spec b/kata-integration.spec index 2a82116..63fd2d9 100644 --- a/kata-integration.spec +++ b/kata-integration.spec @@ -1,6 +1,6 @@ %global debug_package %{nil} %define VERSION v1.0.0 -%define RELEASE 4 +%define RELEASE 5 Name: kata-integration Version: %{VERSION} @@ -28,6 +28,12 @@ This is a usefult tool for building Kata Container components. %doc %changelog +* Wed Aug 25 2021 Wei Gao - 1.0.0-5 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:modify x86_64 kernel config for kata + * Fri Aug 20 2021 yangfeiyu - 1.0.0-4 - Type:bugfix - ID:NA diff --git a/patches/0004-kata_integration-modify-x86_64-kernel-config-for-kat.patch b/patches/0004-kata_integration-modify-x86_64-kernel-config-for-kat.patch new file mode 100644 index 0000000..a500e54 --- /dev/null +++ b/patches/0004-kata_integration-modify-x86_64-kernel-config-for-kat.patch @@ -0,0 +1,29 @@ +From 15aea9afc7f15bd625da438a4c0d490d1884f1c2 Mon Sep 17 00:00:00 2001 +From: holyfei +Date: Wed, 25 Aug 2021 14:14:01 +0800 +Subject: [PATCH] kata_integration: modify x86_64 kernel config for kata + +reason: modify x86_64 kernel config for kata + +Signed-off-by: Wei Gao +--- + hack/config-kata-x86_64 | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/hack/config-kata-x86_64 b/hack/config-kata-x86_64 +index e5e3cbf..69302d7 100644 +--- a/hack/config-kata-x86_64 ++++ b/hack/config-kata-x86_64 +@@ -2176,8 +2176,9 @@ CONFIG_VIRTIO_MENU=y + CONFIG_VIRTIO_PCI=y + CONFIG_VIRTIO_PCI_LEGACY=y + CONFIG_VIRTIO_BALLOON=y +-# CONFIG_VIRTIO_INPUT is not set ++CONFIG_VIRTIO_INPUT=y + CONFIG_VIRTIO_MMIO=y ++CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y + + # + # Microsoft Hyper-V guest support +-- +2.21.1 (Apple Git-122.3) diff --git a/series.conf b/series.conf index e938e01..6343d25 100644 --- a/series.conf +++ b/series.conf @@ -1,3 +1,4 @@ 0001-kata-containers-disable-netmon-by-default.patch 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 -- Gitee