!62 修改kernel config，添加对shared_fs:virtio-fs选项支持

From: @northgarden 
Reviewed-by: @yangzhao_kl 
Signed-off-by: @yangzhao_kl

apply-patches

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+if [[ -f ./patch_flag ]];then
+    echo "kata_integration patched!"
+    exit 0
+fi
+
+tar -zxvf kata_integration-*.tar.gz
+cat ./series.conf | while read line
+do
+    if [[ $line == '' || $line =~ ^\s*# ]]; then
+        continue
+    fi
+    echo "====patch $line======"
+    pwd
+    patch -p1 -F1 -s < ./patches/$line
+done
+
+touch ./patch_flag

kata-containers.spec

@@ -1,76 +0,0 @@
-#needsrootforbuild
-%global debug_package %{nil}
-
-%define VERSION v1.11.1
-%define RELEASE 5
-
-Name:           kata-containers
-Version:        %{VERSION}
-Release:        %{RELEASE}
-Summary:        Kata Container integration
-License:        Apache 2.0
-URL:            https://gitee.com/src-openeuler/kata_integration
-BuildRoot:      %_topdir/BUILDROOT
-BuildRequires:  automake golang gcc bc glibc-devel glibc-static busybox glib2-devel glib2 ipvsadm conntrack-tools nfs-utils
-BuildRequires:  patch elfutils-libelf-devel openssl-devel bison flex
-BuildRequires:  kata-runtime kata-agent kata-proxy kata-shim kata-micro-kernel
-
-%description
-This is core component of Kata Container, to make it work, you need a docker engine.
-
-%prep
-
-%build
-
-%install
-mkdir -p -m 755  %{buildroot}/var/lib/kata
-mkdir -p -m 750  %{buildroot}/usr/bin
-install -p -m 750 /usr/bin/kata-runtime /usr/bin/kata-proxy /usr/bin/kata-shim /usr/bin/kata-netmon %{buildroot}/usr/bin/
-install -p -m 755 /var/lib/kata/kernel %{buildroot}/var/lib/kata/
-install -p -m 640 /var/lib/kata/kata-containers-initrd.img %{buildroot}/var/lib/kata/
-mkdir -p -m 750 %{buildroot}/usr/share/defaults/kata-containers/
-install -p -m 640 -D /usr/share/defaults/kata-containers/configuration.toml %{buildroot}/usr/share/defaults/kata-containers/configuration.toml
-
-%clean
-
-%files
-/usr/bin/kata-runtime
-/usr/bin/kata-proxy
-/usr/bin/kata-shim
-/usr/bin/kata-netmon
-/var/lib/kata/kernel
-/var/lib/kata/kata-containers-initrd.img
-%config(noreplace) /usr/share/defaults/kata-containers/configuration.toml
-
-%doc
-
-%changelog
-* Fri Oct 9 2020 yangfeiyu<yangfeiyu2@huawei.com> - 1.11.1-5
-- Type:enhancement
-- ID:NA
-- SUG:restart
-- DESC:directly copy kata binary files instead of building them
-
-* Wed Sep 30 2020 yangfeiyu<yangfeiyu2@huawei.com> - 1.11.1-4
-- Type:bugfix
-- ID:NA
-- SUG:restart
-- DESC:kata-runtime retry inserting of CNI interface
-
-* Sun Sep 27 2020 LiangZhang<zhangliang5@Huawei.com> - 1.11.1-3
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC:fix cmd params of direct use stratovirt binary
-
-* Thu Sep 20 2020 jiangpengf<jiangpengfei9@huawei.com> - 1.11.1-2
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC:fix del-iface doesn't delete the tap interface in the host problem
-
-* Thu Aug 27 2020 jiangpengf<jiangpengfei9@huawei.com> - 1.11.1-1
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC:update kata-containers version to v1.11.1-1

kata-integration.spec

@@ -1,14 +1,14 @@
 %global debug_package %{nil}
 %define VERSION v1.0.0
-%define RELEASE 1
+%define RELEASE 11
 
 Name:           kata-integration
 Version:        %{VERSION}
 Release:        %{RELEASE}
 Summary:        Kata Container integration
 License:        Apache 2.0
-URL:            https://gitee.com/src-openeuler/kata_integration
+URL:            https://gitee.com/openeuler/kata_integration
-Source0:        %{name}-%{version}.tar.gz
+Source0:        https://gitee.com/openeuler/kata_integration/repository/archive/v1.0.0?format=tar.gz#/%{name}-%{version}.tar.gz
 
 BuildRoot:      %_topdir/BUILDROOT
 BuildRequires: automake gcc glibc-devel glibc-static patch 
@@ -28,6 +28,36 @@ This is a usefult tool for building Kata Container components.
 %doc
 
 %changelog
+* Thu Jun 20 2024 zhangbowei<zhangbowei@kylinos.cn> - 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<xiadanni1@huawei.com> - 1.0.0-10
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:delete unused kata-micro-kernel.spec
+
+* Wed Aug 18 2022 chengzeruizhi<chengzeruizhi@huawei.com> - 1.0.0-9
+- Type:enhancement
+- ID:NA
+- SUG:NA
+- DESC:adapt to kata-containers
+
+* Fri Aug 5 2022 xiadanni<xiadanni1@huawei.com> - 1.0.0-8
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:bump version to 1.0.0-8
+
+* Sat Sep 5 2020 jiangpengf<jiangpengfei9@huawei.com> - 1.0.0-2
+- Type:enhancement
+- ID:NA
+- SUG:NA
+- DESC:change Source format to URL
+
 * Wed Aug 26 2020 jiangpengf<jiangpengfei9@huawei.com> - 1.0.0-1
 - Type:enhancement
 - ID:NA

kata-micro-kernel.spec

@@ -1,69 +0,0 @@
-%global debug_package %{nil}
-%global TarballVer 4.19.138
-
-%define VERSION 4.19.138
-%define RELEASE 1
-
-%define with_patch 0
-%define with_source 1
-
-Name:           kata-micro-kernel
-Version:        %{VERSION}
-Release:        %{RELEASE}
-Summary:        Micro Linux Kernel For Kata-containers
-License:        GPLv2
-URL:            http://www.kernel.org/
-Source0:        kernel.tar.gz
-Source1:        kata_integration-v1.0.0.tar.gz
-
-BuildRoot:      %_topdir/BUILDROOT
-BuildRequires:  patch bash perl automake make gcc binutils hostname bc openssl-devel glibc-devel glibc-static
-BuildRequires:  ncurses-devel elfutils-devel elfutils-libelf-devel elfutils binutils-devel bison flex
-
-%description
-This kernel is customed as kata-containers guest kernel, which is core of the kata-containers.
-
-%prep
-%setup -q -c -a 0 -n kernel
-%setup -q -c -a 1 -n kata_integration
-
-# extract the kata_integration.tar.gz file
-cd %{_builddir}/kata_integration
-tar -xzf kata_integration-v1.0.0.tar.gz
-
-# build kernel
-cd %{_builddir}/kernel
-mv kernel linux-%{version}
-cd %{_builddir}/kernel/linux-%{version}
-
-%ifarch %{ix86} x86_64
-cp %{_builddir}/kata_integration/hack/config-kata-x86_64 ./.config
-%else
-cp %{_builddir}/kata_integration/hack/config-kata-arm64 ./.config
-%endif
-
-%build
-cd %{_builddir}/kernel/linux-%{version}
-make %{?_smp_mflags}
-
-%install
-mkdir -p -m 755  %{buildroot}/var/lib/kata
-%ifarch %{ix86} x86_64
-install -p -m 755 -D %{_builddir}/kernel/linux-%{version}/arch/x86_64/boot/bzImage %{buildroot}/var/lib/kata/kernel
-%else
-install -p -m 755 -D %{_builddir}/kernel/linux-%{version}/arch/arm64/boot/Image %{buildroot}/var/lib/kata/kernel
-%endif
-
-%clean
-
-%files
-/var/lib/kata/kernel
-
-%doc
-
-%changelog
-* Thu Aug 27 2020 jiangpengfei<jiangpengfei9@huawei.com> - 4.19.138-1
-- Type:enhancement
-- ID:NA
-- SUG:restart
-- DESC:init kata-micro-kernel package

kata_integration.yaml

@@ -0,0 +1,4 @@
+version_control: gitee
+src_repo: openEuler/kata_integration
+tag_prefix:
+seperator: "."

patches/0001-kata-containers-disable-netmon-by-default.patch

@@ -0,0 +1,35 @@
+From 553338441418935cfe76db0c90a8fa58f12cfa37 Mon Sep 17 00:00:00 2001
+From: holyfei <yangfeiyu20102011@163.com>
+Date: Sun, 1 Nov 2020 21:03:25 +0800
+Subject: [PATCH] kata-containers: disable netmon by default
+
+reason: disable netmon by default, user can modify the
+enable_netmon config to enable netmon components.
+
+Signed-off-by: holyfei <yangfeiyu20102011@163.com>
+---
+ scripts/make_default_configuration.sh | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/scripts/make_default_configuration.sh b/scripts/make_default_configuration.sh
+index 1cd5d61..c998c46 100755
+--- a/scripts/make_default_configuration.sh
++++ b/scripts/make_default_configuration.sh
+@@ -27,13 +27,12 @@ sed -i 's/^#enable_blk_mount/enable_blk_mount/' $KATA_CONFIG_PATH
+ sed -i 's#/usr/libexec/kata-containers/kata-proxy#/usr/bin/kata-proxy#' $KATA_CONFIG_PATH
+ sed -i 's#/usr/libexec/kata-containers/kata-shim#/usr/bin/kata-shim#' $KATA_CONFIG_PATH
+ sed -i 's#/usr/libexec/kata-containers/kata-netmon#/usr/bin/kata-netmon#' $KATA_CONFIG_PATH
+-sed -i 's/^#enable_netmon/enable_netmon/' $KATA_CONFIG_PATH
+ sed -i 's/^#disable_new_netns/disable_new_netns/' $KATA_CONFIG_PATH
+ sed -i 's/^#disable_vhost_net/disable_vhost_net/' $KATA_CONFIG_PATH
+ sed -i 's/^#block_device_cache_set/block_device_cache_set/' $KATA_CONFIG_PATH
+ sed -i 's/^#block_device_cache_direct/block_device_cache_direct/' $KATA_CONFIG_PATH
+ sed -i 's#path = \"/usr/bin/qemu-.*\"#path = \"/usr/bin/qemu-kvm\"#' $KATA_CONFIG_PATH
+-sed -i 's/^internetworking_model.*$/internetworking_model=\"bridged\"/' $KATA_CONFIG_PATH
++sed -i 's/^internetworking_model.*$/internetworking_model = \"none\"/' $KATA_CONFIG_PATH
+ 
+ if [ "$ARCH" == "aarch64" ];then
+     sed -i 's/^machine_type.*$/machine_type = \"virt\"/' $KATA_CONFIG_PATH
+-- 
+2.11.0
+

patches/0002-kata_integration-adapt-with-new-kata-containers.patch

@@ -0,0 +1,67 @@
+From c26cf7520b4fe94dff39742b32168ac0bd36c212 Mon Sep 17 00:00:00 2001
+From: holyfei <yangfeiyu20102011@163.com>
+Date: Wed, 18 Aug 2021 10:50:26 +0800
+Subject: [PATCH] kata_integration: adapt with new kata-containers
+
+reason: adapt with new kata-containers
+
+Signed-off-by: holyfei <yangfeiyu20102011@163.com>
+---
+ Makefile                | 2 +-
+ hack/config-kata-arm64  | 2 +-
+ hack/config-kata-x86_64 | 6 +++---
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index f22fc80..db6b799 100644
+--- a/Makefile
++++ b/Makefile
+@@ -55,7 +55,7 @@ agent:
+ test: 
+ 	docker run -ti --rm --runtime=kata-runtime  busybox sh
+ 
+-initrd: agent
++initrd:
+ 	sh ./scripts/make_kata_container_initrd.sh
+ 
+ debug-initrd: runtime
+diff --git a/hack/config-kata-arm64 b/hack/config-kata-arm64
+index 253af36..425bb52 100644
+--- a/hack/config-kata-arm64
++++ b/hack/config-kata-arm64
+@@ -548,7 +548,7 @@ CONFIG_ACPI_GTDT=y
+ CONFIG_ACPI_PPTT=y
+ CONFIG_VIRTUALIZATION=y
+ # CONFIG_KVM is not set
+-# CONFIG_VHOST_NET is not set
++CONFIG_VHOST_NET=y
+ CONFIG_VHOST_VSOCK=y
+ CONFIG_VHOST=y
+ # CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
+diff --git a/hack/config-kata-x86_64 b/hack/config-kata-x86_64
+index 452f903..7c57225 100644
+--- a/hack/config-kata-x86_64
++++ b/hack/config-kata-x86_64
+@@ -583,8 +583,8 @@ CONFIG_FIRMWARE_MEMMAP=y
+ CONFIG_HAVE_KVM=y
+ CONFIG_VIRTUALIZATION=y
+ # CONFIG_KVM is not set
+-# CONFIG_VHOST_NET is not set
+-# CONFIG_VHOST_VSOCK is not set
++CONFIG_VHOST_NET=y
++CONFIG_VHOST_VSOCK=y
+ # CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
+ 
+ #
+@@ -1261,7 +1261,7 @@ CONFIG_DNS_RESOLVER=y
+ # CONFIG_OPENVSWITCH is not set
+ CONFIG_VSOCKETS=y
+ CONFIG_VSOCKETS_DIAG=y
+-# CONFIG_VIRTIO_VSOCKETS is not set
++CONFIG_VIRTIO_VSOCKETS=y
+ # CONFIG_NETLINK_DIAG is not set
+ # CONFIG_MPLS is not set
+ # CONFIG_NET_NSH is not set
+-- 
+2.23.0
+

patches/0003-kata_integration-modify-kernel-config-for-kata.patch

@@ -0,0 +1,42 @@
+From 8a527dfce24b0c71328812646f48b65df02b4890 Mon Sep 17 00:00:00 2001
+From: holyfei <yangfeiyu20102011@163.com>
+Date: Fri, 20 Aug 2021 10:11:09 +0800
+Subject: [PATCH] kata_integration: modify kernel config for kata
+
+reason: modify kernel config for kata
+
+Signed-off-by: holyfei <yangfeiyu20102011@163.com>
+---
+ hack/config-kata-arm64  | 2 +-
+ hack/config-kata-x86_64 | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/hack/config-kata-arm64 b/hack/config-kata-arm64
+index 425bb52..bbea2a5 100644
+--- a/hack/config-kata-arm64
++++ b/hack/config-kata-arm64
+@@ -1946,7 +1946,7 @@ CONFIG_VIRTIO_PCI=y
+ CONFIG_VIRTIO_PCI_LEGACY=y
+ CONFIG_VIRTIO_BALLOON=y
+ CONFIG_VIRTIO_INPUT=y
+-# CONFIG_VIRTIO_MMIO is not set
++CONFIG_VIRTIO_MMIO=y
+ 
+ #
+ # Microsoft Hyper-V guest support
+diff --git a/hack/config-kata-x86_64 b/hack/config-kata-x86_64
+index 7c57225..e5e3cbf 100644
+--- a/hack/config-kata-x86_64
++++ b/hack/config-kata-x86_64
+@@ -2177,7 +2177,7 @@ CONFIG_VIRTIO_PCI=y
+ CONFIG_VIRTIO_PCI_LEGACY=y
+ CONFIG_VIRTIO_BALLOON=y
+ # CONFIG_VIRTIO_INPUT is not set
+-# CONFIG_VIRTIO_MMIO is not set
++CONFIG_VIRTIO_MMIO=y
+ 
+ #
+ # Microsoft Hyper-V guest support
+-- 
+2.23.0
+

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 <yangfeiyu20102011@163.com>
+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 <gaowei66@huawei.com>
+---
+ 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)

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 <yangfeiyu20102011@163.com>
+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
+

series.conf

@@ -0,0 +1,5 @@
+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
+0005-kata_integration-modify-kernel-config-for-virtio-fs.patch