diff --git a/apply-patches b/apply-patches new file mode 100755 index 0000000000000000000000000000000000000000..9df8e8d9b11ee66da95cc5bc6dc612b5794e946d --- /dev/null +++ b/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 diff --git a/kata-containers.spec b/kata-containers.spec deleted file mode 100644 index 49d1f427c07dffb1c8f51101f310e9e16b10575a..0000000000000000000000000000000000000000 --- a/kata-containers.spec +++ /dev/null @@ -1,179 +0,0 @@ -#needsrootforbuild -%global debug_package %{nil} -%global kernel_version 4.19.36 - -%define VERSION v1.11.1 -%define RELEASE 2 - -Name: kata-containers -Version: %{VERSION} -Release: %{RELEASE} -Summary: Kata Container integration -License: Apache 2.0 -URL: https://gitee.com/src-openeuler/kata_integration -Source0: kata_integration-v1.0.0.tar.gz -Source1: kata-runtime-%{version}.tar.gz -Source2: kata-agent-%{version}.tar.gz -Source3: kata-proxy-%{version}.tar.gz -Source4: kata-shim-%{version}.tar.gz -Source5: linux-%{kernel_version}.tar.gz - -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 - -%description -This is core component of Kata Container, to make it work, you need a docker engine. - -%prep -%setup -q -c -a 0 -n %{name}-%{version} -%setup -q -c -a 1 -n %{name}-%{version}/runtime -%setup -q -c -a 2 -n %{name}-%{version}/agent -%setup -q -c -a 3 -n %{name}-%{version}/proxy -%setup -q -c -a 4 -n %{name}-%{version}/shim -%setup -q -c -a 5 -n kernel - -# extract the kata_integration.tar.gz file -cd %{_builddir}/%{name}-%{version} -tar -xzf kata_integration-v1.0.0.tar.gz - -# build kernel -cd %{_builddir}/kernel -mv kernel linux -if ls patches.tar.* >/dev/null 2>&1;then - tar -xf patches.tar.* -fi -cd %{_builddir}/kernel/linux/ -%ifarch %{ix86} x86_64 -cp %{_builddir}/%{name}-%{version}/hack/config-kata-x86_64 ./.config -%else -cp %{_builddir}/%{name}-%{version}/hack/config-kata-arm64 ./.config -%endif - -patch_list="%{_builddir}/kernel/series.conf" -IFS=$'\n' -for patch_name in `cat $patch_list` -do - echo $patch_name - if [ "${patch_name:0:1}" != "#" ]; then - patch -p1 -F1 -s < %{_builddir}/kernel/${patch_name} - echo "add patch done : $patch_name" - fi -done - -%build -cd %{_builddir}/kernel/linux/ -make %{?_smp_mflags} - -cd %{_builddir}/%{name}-%{version} -mkdir -p -m 750 build -make runtime -make proxy -make shim -%if 0%{?integrate_driver} - make initrd INTEGRATE_DRIVER=true -%else - make initrd -%endif - -%install -mkdir -p -m 755 %{buildroot}/var/lib/kata -%ifarch %{ix86} x86_64 -install -p -m 755 -D %{_builddir}/kernel/linux/arch/x86_64/boot/bzImage %{buildroot}/var/lib/kata/kernel -%else -install -p -m 755 -D %{_builddir}/kernel/linux/arch/arm64/boot/Image %{buildroot}/var/lib/kata/kernel -%endif - -cd %{_builddir}/%{name}-%{version} -mkdir -p -m 750 %{buildroot}/usr/bin -install -p -m 750 ./build/kata-runtime ./build/kata-proxy ./build/kata-shim ./build/kata-netmon %{buildroot}/usr/bin/ -install -p -m 640 ./build/kata-containers-initrd.img %{buildroot}/var/lib/kata/ -mkdir -p -m 750 %{buildroot}/usr/share/defaults/kata-containers/ -install -p -m 640 -D ./runtime/cli/config/configuration-qemu.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 -/usr/share/defaults/kata-containers/configuration.toml - -%doc - - -%changelog -* Thu Sep 20 2020 jiangpengf - 1.1.1-2 -- Type:enhancement -- ID:NA -- SUG:NA -- DESC:fix del-iface doesn't delete the tap interface in the host problem - -* Thu Aug 27 2020 jiangpengf - 1.1.1-1 -- Type:enhancement -- ID:NA -- SUG:NA -- DESC:update kata-containers version to v1.11.1-1 - -* Tue Apr 21 2020 jiangpengf - 1.0.3.21 -- Type:bugfix -- ID:NA -- SUG:NA -- DESC:fix kata-netmon ignore add RTPROT_KERNEL route problem - -* Thu Apr 2 2020 jiangpengf - 1.0.3.20 -- Type:enhancement -- ID:NA -- SUG:NA -- DESC:add netmon back to rpm package and enable default hypervisor_params - -* Tue Dec 31 2019 yangfeiyu - 1.0.3.18 -- Type:enhancement -- ID:NA -- SUG:NA -- DESC:Do not use fPIC in making kernel. - -* Fri Nov 29 2019 yangfeiyu - 1.0.3.17 -- Type:enhancement -- ID:NA -- SUG:NA -- DESC:Build kernel in kata-container. - -* Wed Aug 14 2019 leizhongkai - next-1.0.3.h16 -- Type:enhancement -- ID:NA -- SUG:NA -- DESC:Use definition to control whether to integrate drivers. - -* Mon Jan 31 2019 jiangpengfei - next-1.0.3.h6 -- Type:enhancement -- ID:NA -- SUG:NA -- DESC:fix kata-runtime to satisfy docker 18.09 - -* Mon Jan 7 2019 jiangpengfei - next-1.0.3.h5 -- Type:enhancement -- ID:NA -- SUG:NA -- DESC:update kata-container spec - -* Fri Dec 28 2018 jiangpengfei - next-1.0.3.h4 -- Type:enhancement -- ID:NA -- SUG:NA -- DESC:update kata-container spec - -* Fri Nov 20 2018 jiangpengfei - next-1.0.3.h3 -- Type:enhancement -- ID:NA -- SUG:NA -- DESC:update kata-container spec - -* Fri Oct 19 2018 leizhongkai - next-1.0.3.h1 -- Type:enhancement -- ID:NA -- SUG:NA -- DESC:init kata-container spec diff --git a/kata-integration.spec b/kata-integration.spec index 7664af50dd201a7425ccb0909ca9b24672a9f395..469b4930f06c4b3a3121ce71633d466381fc2d6f 100644 --- a/kata-integration.spec +++ b/kata-integration.spec @@ -1,14 +1,14 @@ %global debug_package %{nil} %define VERSION v1.0.0 -%define RELEASE 1 +%define RELEASE 2 Name: kata-integration Version: %{VERSION} Release: %{RELEASE} Summary: Kata Container integration License: Apache 2.0 -URL: https://gitee.com/src-openeuler/kata_integration -Source0: %{name}-%{version}.tar.gz +URL: https://gitee.com/openeuler/kata_integration +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,12 @@ This is a usefult tool for building Kata Container components. %doc %changelog +* Sat Sep 5 2020 jiangpengf - 1.0.0-2 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC:change Source format to URL + * Wed Aug 26 2020 jiangpengf - 1.0.0-1 - Type:enhancement - ID:NA diff --git a/patches/0001-kata-containers-disable-netmon-by-default.patch b/patches/0001-kata-containers-disable-netmon-by-default.patch new file mode 100644 index 0000000000000000000000000000000000000000..f45b8461101deb5881084b60447d0f72dea5e931 --- /dev/null +++ b/patches/0001-kata-containers-disable-netmon-by-default.patch @@ -0,0 +1,35 @@ +From 553338441418935cfe76db0c90a8fa58f12cfa37 Mon Sep 17 00:00:00 2001 +From: holyfei +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 +--- + 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 + diff --git a/series.conf b/series.conf new file mode 100644 index 0000000000000000000000000000000000000000..d31db34dfb99a565132839ff506fbf197dd3b306 --- /dev/null +++ b/series.conf @@ -0,0 +1 @@ +0001-kata-containers-disable-netmon-by-default.patch