!39 kata_integration: modify kernel config for kata
From: @holyfei Reviewed-by: @caihaomin Signed-off-by: @caihaomin
This commit is contained in:
openeuler-ci-bot
Gitee
commit
d5e5e89454
@ -1,136 +0,0 @@
|
||||
#needsrootforbuild
|
||||
%global debug_package %{nil}
|
||||
%global kernel_version 4.19.36
|
||||
|
||||
%define VERSION v1.11.1
|
||||
%define RELEASE 6
|
||||
|
||||
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 -T -c -a 0 -n %{name}-%{version}
|
||||
%setup -T -c -a 1 -n runtime
|
||||
%setup -T -c -a 2 -n agent
|
||||
%setup -T -c -a 3 -n proxy
|
||||
%setup -T -c -a 4 -n shim
|
||||
%setup -T -c -a 5 -n kernel
|
||||
|
||||
# extract the kata_integration.tar.gz file
|
||||
cd %{_builddir}/%{name}-%{version}
|
||||
# apply kata_integration patches
|
||||
sh apply-patches
|
||||
|
||||
# mv build components into kata_integration dir
|
||||
pushd %{_builddir}/%{name}-%{version}
|
||||
mv ../runtime .
|
||||
mv ../agent .
|
||||
mv ../proxy .
|
||||
mv ../shim .
|
||||
popd
|
||||
|
||||
# build kernel
|
||||
cd %{_builddir}/kernel
|
||||
mv kernel linux
|
||||
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
|
||||
|
||||
%build
|
||||
echo %{_builddir}
|
||||
echo %{name}-%{version}
|
||||
cd %{_builddir}/kernel/linux/
|
||||
make %{?_smp_mflags}
|
||||
|
||||
cd %{_builddir}/%{name}-%{version}
|
||||
mkdir -p -m 750 build
|
||||
make runtime
|
||||
make proxy
|
||||
make shim
|
||||
make initrd
|
||||
|
||||
%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
|
||||
%config(noreplace) /usr/share/defaults/kata-containers/configuration.toml
|
||||
|
||||
%doc
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Nov 6 2020 yangfeiyu<yangfeiyu2@huawei.com> - 1.11.1-6
|
||||
- Type:bugfix
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC:revert the kata-containers.spec to still build kata-containers components into one package
|
||||
|
||||
* 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
|
||||
@ -1,6 +1,6 @@
|
||||
%global debug_package %{nil}
|
||||
%define VERSION v1.0.0
|
||||
%define RELEASE 3
|
||||
%define RELEASE 4
|
||||
|
||||
Name: kata-integration
|
||||
Version: %{VERSION}
|
||||
@ -28,6 +28,12 @@ This is a usefult tool for building Kata Container components.
|
||||
%doc
|
||||
|
||||
%changelog
|
||||
* Fri Aug 20 2021 yangfeiyu<yangfeiyu2@huawei.com> - 1.0.0-4
|
||||
- Type:bugfix
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC:modify kernel config for kata
|
||||
|
||||
* Wed Aug 18 2021 yangfeiyu<yangfeiyu2@huawei.com> - 1.0.0-3
|
||||
- Type:enhancement
|
||||
- ID:NA
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1,2 +1,3 @@
|
||||
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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user