From 746f743b6f79f9d44c69b34060131427a1881866 Mon Sep 17 00:00:00 2001 From: dongyuzhen Date: Wed, 15 Oct 2025 10:55:53 +0800 Subject: [PATCH] fix build check for kata-containers (cherry picked from commit 4438c4e574826544291e944d1722050c21cf2801) --- kata-containers.spec | 32 +++++++++++++++++++------------- kata_integration_clone | 2 ++ 2 files changed, 21 insertions(+), 13 deletions(-) create mode 100755 kata_integration_clone diff --git a/kata-containers.spec b/kata-containers.spec index 92d14b7..1b6394b 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -2,7 +2,7 @@ %global debug_package %{nil} %define VERSION 1.11.1 -%define RELEASE 26 +%define RELEASE 27 Name: kata-containers Version: %{VERSION} @@ -10,33 +10,33 @@ 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 +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 BuildRequires: patch elfutils-libelf-devel openssl-devel bison flex +# 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-%{version} -%setup -T -c -a 2 -n kernel +# 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 # 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 . +mv %{_sourcedir}/runtime . +mv %{_sourcedir}/agent . +mv %{_sourcedir}/proxy . +mv %{_sourcedir}/shim . popd # build kernel @@ -98,6 +98,12 @@ install -p -m 640 -D ./runtime/cli/config/configuration-qemu.toml %{buildroot}/u %doc %changelog +* Wed Oct 15 2025 dongyuzhen - 1.11.1-27 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC:fix build check for kata-containers + * Thu Feb 02 2023 Vanient - 1.11.1-26 - Type:bugfix - CVE:NA diff --git a/kata_integration_clone b/kata_integration_clone new file mode 100755 index 0000000..df0f746 --- /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 -- Gitee