diff --git a/kata-containers.spec b/kata-containers.spec index fd8235337ed15ff5da38eba2077845f25e082e7d..66b006d64e485b3c77cf4f4e4fc92beec0b75885 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -2,17 +2,15 @@ %global debug_package %{nil} %define VERSION 3.2.0 -%define RELEASE 10 +%define RELEASE 11 -Name: kata-containers +Name: kata-containers-1 Version: %{VERSION} Release: %{RELEASE} Summary: Kata Container, the speed of containers, the security of VMs License: ISC and Apache-2.0 and GPL-2.0-or-later and CC-BY-SA-4.0 and MIT and MPL-2.0 URL: https://github.com/kata-containers -Source0: kata_integration-openeuler.tar.gz -Source1: kata-containers-openeuler.tar.gz -Source2: kernel.tar.gz +Source0: kernel.tar.gz BuildRoot: %_topdir/BUILDROOT BuildRequires: automake golang gcc bc glibc-devel glibc-static busybox glib2-devel glib2 ipvsadm conntrack-tools nfs-utils @@ -20,18 +18,21 @@ BuildRequires: patch elfutils-libelf-devel openssl-devel bison flex rust cargo %ifarch riscv64 loongarch64 BuildRequires: protobuf-compiler dwarves %endif +# obtain kata_integration code requires git +BuildRequires: git %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 -%setup -T -c -a 2 -n kernel +echo "This is prep" +# obtain kata_integration +sh %{_sourcedir}/kata_integration_clone + +%setup -T -c -a 0 -n kernel -# extract the kata_integration.tar.gz file -cd %{_builddir}/kata_integration # apply kata_integration patches +cd %{_builddir}/kata_integration sh apply-patches # build kernel @@ -48,6 +49,19 @@ cp arch/loongarch/configs/loongson3_defconfig ./.config cp %{_builddir}/kata_integration/hack/config-kata-arm64 ./.config %endif +mkdir %{_builddir}/kata-containers +mv %{_sourcedir}/patches %{_builddir}/kata-containers/ +mv %{_sourcedir}/apply-patches %{_builddir}/kata-containers/ +mv %{_sourcedir}/series.conf %{_builddir}/kata-containers/ +mv %{_sourcedir}/kata-containers-3.2.0-vendor.tar.gz %{_builddir}/kata-containers/ +mv %{_sourcedir}/kata-containers-3.2.0.tar.gz %{_builddir}/kata-containers/ +mv %{_sourcedir}/version.rs %{_builddir}/kata-containers/ + +%ifarch loongarch64 +mv %{_sourcedir}/apply-patches-loongarch64 %{_builddir}/kata-containers/ +mv %{_sourcedir}/series-loongarch64.conf %{_builddir}/kata-containers/ +%endif + cd %{_builddir}/kata-containers/ sh -x apply-patches tar -xzf kata-containers-%{version}-vendor.tar.gz @@ -126,6 +140,12 @@ strip %{buildroot}/usr/bin/containerd-shim-kata-v2 %doc %changelog +* Fri Sep 12 2025 dongyuzhen - 3.2.0-11 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC:fix build check for kata-containers + * Thu Sep 11 2025 dongyuzhen - 3.2.0-10 - Type:bugfix - ID:NA diff --git a/kata_integration_clone b/kata_integration_clone new file mode 100755 index 0000000000000000000000000000000000000000..df0f746bbc1093569129ffbf3899792b0da93ced --- /dev/null +++ b/kata_integration_clone @@ -0,0 +1,2 @@ +#!/bin/bash +git clone --branch "${spec_branch}" --depth=1 https://gitee.com/src-openeuler/kata_integration.git