From 3eeb9c4ab33bb3171fdaea003397b8cb0bcabed4 Mon Sep 17 00:00:00 2001 From: bwzhang Date: Thu, 20 Jun 2024 15:45:56 +0800 Subject: [PATCH] modify kernel config for supporting shared_fs:virtio-fs option (cherry picked from commit 37eb85bdfa0ab73cfebdb5e7b679cca463a073f8) --- kata-integration.spec | 8 +++- ...n-modify-kernel-config-for-virtio-fs.patch | 37 +++++++++++++++++++ series.conf | 1 + 3 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 patches/0005-kata_integration-modify-kernel-config-for-virtio-fs.patch diff --git a/kata-integration.spec b/kata-integration.spec index 49c9feb..fb35f55 100644 --- a/kata-integration.spec +++ b/kata-integration.spec @@ -1,6 +1,6 @@ %global debug_package %{nil} %define VERSION v1.0.0 -%define RELEASE 10 +%define RELEASE 11 Name: kata-integration Version: %{VERSION} @@ -28,6 +28,12 @@ This is a usefult tool for building Kata Container components. %doc %changelog +* Thu Jun 20 2024 zhangbowei - 1.0.0-11 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: modify kernel config for supporting shared_fs:virtio-fs option + * Mon Aug 28 2023 Vanient - 1.0.0-10 - Type:bugfix - ID:NA diff --git a/patches/0005-kata_integration-modify-kernel-config-for-virtio-fs.patch b/patches/0005-kata_integration-modify-kernel-config-for-virtio-fs.patch new file mode 100644 index 0000000..a381481 --- /dev/null +++ b/patches/0005-kata_integration-modify-kernel-config-for-virtio-fs.patch @@ -0,0 +1,37 @@ +From 4d0a714a2b32d966b7fa4b8e36a749d7790c4e65 Mon Sep 17 00:00:00 2001 +From: holyfei +Date: Thu, 20 Jun 2024 15:37:14 +0800 +Subject: [PATCH] kata_integration modify kernel config for virtio-fs + +--- + hack/config-kata-arm64 | 1 + + hack/config-kata-x86_64 | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/hack/config-kata-arm64 b/hack/config-kata-arm64 +index bbea2a5..65ce304 100644 +--- a/hack/config-kata-arm64 ++++ b/hack/config-kata-arm64 +@@ -2147,6 +2147,7 @@ CONFIG_AUTOFS4_FS=y + CONFIG_AUTOFS_FS=y + CONFIG_FUSE_FS=y + # CONFIG_CUSE is not set ++CONFIG_VIRTIO_FS=y + # CONFIG_OVERLAY_FS is not set + + # +diff --git a/hack/config-kata-x86_64 b/hack/config-kata-x86_64 +index 69302d7..6a8120c 100644 +--- a/hack/config-kata-x86_64 ++++ b/hack/config-kata-x86_64 +@@ -2393,6 +2393,7 @@ CONFIG_AUTOFS4_FS=y + CONFIG_AUTOFS_FS=y + CONFIG_FUSE_FS=y + # CONFIG_CUSE is not set ++CONFIG_VIRTIO_FS=y + CONFIG_OVERLAY_FS=y + CONFIG_OVERLAY_FS_REDIRECT_DIR=y + CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y +-- +2.20.1 + diff --git a/series.conf b/series.conf index 6343d25..4a7316e 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-kernel-config-for-virtio-fs.patch -- Gitee