`kernel_irqchip` option doesn't seem to bring any benefits and, on the
contrary, its usage cause issues when using the microvm machine type.
With this in mind, let's remove it.
upstream:17de94e118
Signed-off-by: Vanient <xiadanni1@huawei.com>
(cherry picked from commit 0cf3a45ae7512f10d3c4728529a9819a368057a2)
256 lines
7.0 KiB
RPMSpec
256 lines
7.0 KiB
RPMSpec
#needsrootforbuild
|
|
%global debug_package %{nil}
|
|
|
|
%define VERSION 1.11.1
|
|
%define RELEASE 26
|
|
|
|
Name: kata-containers
|
|
Version: %{VERSION}
|
|
Release: %{RELEASE}
|
|
Summary: Kata Container, the speed of containers, the security of VMs
|
|
License: Apache 2.0
|
|
URL: https://github.com/kata-containers
|
|
Source0: kata_integration-v1.0.0.tar.gz
|
|
Source1: kata-containers-v%{version}.tar.gz
|
|
Source2: kernel.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 isulad/docker engine.
|
|
|
|
%prep
|
|
%setup -T -c -a 0 -n kata_integration
|
|
%setup -T -c -a 1 -n kata-containers-%{version}
|
|
%setup -T -c -a 2 -n kernel
|
|
|
|
# extract the kata_integration.tar.gz file
|
|
cd %{_builddir}/kata_integration
|
|
# apply kata_integration patches
|
|
sh apply-patches
|
|
|
|
# mv build components into kata_integration dir
|
|
pushd %{_builddir}/kata_integration
|
|
mv ../kata-containers-%{version}/runtime .
|
|
mv ../kata-containers-%{version}/agent .
|
|
mv ../kata-containers-%{version}/proxy .
|
|
mv ../kata-containers-%{version}/shim .
|
|
popd
|
|
|
|
# build kernel
|
|
cd %{_builddir}/kernel
|
|
mv kernel linux
|
|
cd %{_builddir}/kernel/linux/
|
|
%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/
|
|
make %{?_smp_mflags}
|
|
|
|
cd %{_builddir}/kata_integration
|
|
mkdir -p -m 750 build
|
|
export GO111MODULE=off
|
|
make runtime
|
|
make proxy
|
|
make shim
|
|
make initrd
|
|
cp -f ./runtime/containerd-shim-kata-v2 ./build/
|
|
%ifarch %{ix86} x86_64
|
|
sed -i 's/^hypervisor_params.*$/hypervisor_params = \"\"/' ./runtime/cli/config/configuration-qemu.toml
|
|
%else
|
|
sed -i 's/^hypervisor_params.*$/hypervisor_params = \"kvm-pit.lost_tick_policy=discard pcie-root-port.x-speed=16 pcie-root-port.x-width=32\"/' ./runtime/cli/config/configuration-qemu.toml
|
|
%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}/kata_integration
|
|
mkdir -p -m 750 %{buildroot}/usr/bin
|
|
strip ./build/kata-runtime ./build/kata-proxy ./build/kata-shim ./build/kata-netmon ./build/containerd-shim-kata-v2
|
|
install -p -m 750 ./build/kata-runtime ./build/kata-proxy ./build/kata-shim ./build/kata-netmon ./build/containerd-shim-kata-v2 %{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
|
|
/usr/bin/containerd-shim-kata-v2
|
|
/var/lib/kata/kernel
|
|
/var/lib/kata/kata-containers-initrd.img
|
|
%config(noreplace) /usr/share/defaults/kata-containers/configuration.toml
|
|
|
|
%doc
|
|
|
|
%changelog
|
|
* Thu Feb 02 2023 Vanient<xiadanni1@huawei.com> - 1.11.1-26
|
|
- Type:bugfix
|
|
- CVE:NA
|
|
- SUG:NA
|
|
- DESC:remove kernel_irqchip option for qemu 6.2
|
|
|
|
* Thu Nov 17 2022 Vanient<xiadanni1@huawei.com> - 1.11.1-25
|
|
- Type:bugfix
|
|
- CVE:NA
|
|
- SUG:NA
|
|
- DESC:add timeout for all qmp commands
|
|
|
|
* Mon Sep 12 2022 Vanient<xiadanni1@huawei.com> - 1.11.1-24
|
|
- Type:bugfix
|
|
- CVE:NA
|
|
- SUG:NA
|
|
- DESC:sync bugfix patches, runtime 0079-0096 agent 0021-0024
|
|
|
|
* Thu Mar 3 2022 yangfeiyu <yangfeiyu2@huawei.com> - 1.11.1-23
|
|
- Type:enhancement
|
|
- ID:NA
|
|
- SUG:NA
|
|
- DESC:modify runtime build flags
|
|
|
|
* Mon Feb 28 2022 yangfeiyu <yangfeiyu2@huawei.com> - 1.11.1-22
|
|
- Type:enhancement
|
|
- ID:NA
|
|
- SUG:NA
|
|
- DESC:use host_device drive when call blockdev-add
|
|
|
|
* Fri Feb 25 2022 yangfeiyu <yangfeiyu2@huawei.com> - 1.11.1-21
|
|
- Type:enhancement
|
|
- ID:NA
|
|
- SUG:NA
|
|
- DESC:modify hypervisor parameters in config file
|
|
|
|
* Mon Feb 21 2022 yangfeiyu <yangfeiyu2@huawei.com> - 1.11.1-20
|
|
- Type:enhancement
|
|
- ID:NA
|
|
- SUG:NA
|
|
- DESC:check file size before add nic
|
|
|
|
* Fri Jan 7 2022 yangfeiyu <yangfeiyu2@huawei.com> - 1.11.1-19
|
|
- Type:bugfix
|
|
- ID:NA
|
|
- SUG:NA
|
|
- DESC:set GO111MODULE off for go version 1.17.3
|
|
|
|
* Tue Nov 30 2021 yangfeiyu <yangfeiyu2@huawei.com> - 1.11.1-18
|
|
- Type:feature
|
|
- ID:NA
|
|
- SUG:NA
|
|
- DESC:bump version to 18
|
|
|
|
* Wed Jun 16 2021 gaohuatao <gaohuatao@huawei.com> - 1.11.1-17
|
|
- Type:bugfix
|
|
- ID:NA
|
|
- SUG:NA
|
|
- DESC:move timeout of waitProcess to stop process
|
|
|
|
* Thu Jun 3 2021 gaohuatao <gaohuatao@huawei.com> - 1.11.1-16
|
|
- Type:bugfix
|
|
- ID:NA
|
|
- SUG:NA
|
|
- DESC:put timeout to client of wait rpc to support shimv2
|
|
|
|
* Wed May 12 2021 gaohuatao <gaohuatao@huawei.com> - 1.11.1-15
|
|
- Type:bugfix
|
|
- ID:NA
|
|
- SUG:NA
|
|
- DESC:shimv2 write exit code in integer byte order
|
|
|
|
* Wed Apr 28 2021 gaohuatao <gaohuatao@huawei.com> - 1.11.1-14
|
|
- Type:feature
|
|
- ID:NA
|
|
- SUG:NA
|
|
- DESC:kata shimv2 adapt iSulad
|
|
|
|
* Tue Mar 23 2021 jikui <jikui2@huawei.com> - 1.11.1-13
|
|
- Type:bugfix
|
|
- ID:NA
|
|
- SUG:NA
|
|
- DESC:remove ctty to resolve build failed
|
|
|
|
* Mon Mar 22 2021 jikui <jikui2@huawei.com> - 1.11.1-12
|
|
- Type:enhancement
|
|
- ID:NA
|
|
- SUG:NA
|
|
- DESC:add linkmode to resolve build error
|
|
|
|
* Wed Mar 17 2021 jikui <jikui2@huawei.com> - 1.11.1-11
|
|
- Type:enhancement
|
|
- ID:NA
|
|
- SUG:NA
|
|
- DESC:modify make flags
|
|
|
|
* Tue Feb 23 2021 xinghe <xinghe1@huawei.com> - 1.11.1-10
|
|
- Type:CVE
|
|
- ID:NA
|
|
- SUG:NA
|
|
- DESC:fix CVE-2020-28914
|
|
|
|
* Fri Jan 8 2021 LiangZhang<zhangliang5@huawei.com> - 1.11.1-9
|
|
- Type:bugfix
|
|
- ID:NA
|
|
- SUG:NA
|
|
- DESC:fixup that the getPids functions returns pid
|
|
|
|
* Thu Jan 7 2021 LiangZhang<zhangliang5@huawei.com> - 1.11.1-8
|
|
- Type:feature
|
|
- ID:NA
|
|
- SUG:NA
|
|
- DESC:add suport for stratovirt of kata-check cli
|
|
|
|
* Tue Dec 22 2020 jiangpengfei<jiangpengfei9@huawei.com> - 1.11.1-7
|
|
- Type:enhancement
|
|
- ID:NA
|
|
- SUG:update
|
|
- DESC:update kata-containers source forms of organization to move all kata-containers related source repo into one repo kata-containers
|
|
|
|
* 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
|
|
|
|
* Sun 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
|