diff --git a/kata-containers.spec b/kata-containers.spec deleted file mode 100644 index 6bdc1ab4a0e46c8f29d842104252cebc68f8548f..0000000000000000000000000000000000000000 --- a/kata-containers.spec +++ /dev/null @@ -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 - 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 - 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 - 1.11.1-4 -- Type:bugfix -- ID:NA -- SUG:restart -- DESC:kata-runtime retry inserting of CNI interface - -* Sun Sep 27 2020 LiangZhang - 1.11.1-3 -- Type:bugfix -- ID:NA -- SUG:NA -- DESC:fix cmd params of direct use stratovirt binary - -* Thu Sep 20 2020 jiangpengf - 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 - 1.11.1-1 -- Type:enhancement -- ID:NA -- SUG:NA -- DESC:update kata-containers version to v1.11.1-1 diff --git a/kata-integration.spec b/kata_integration.spec similarity index 87% rename from kata-integration.spec rename to kata_integration.spec index 469b4930f06c4b3a3121ce71633d466381fc2d6f..9c6de9d7cb1f17ba0bda0d36ee24f17b417b827d 100644 --- a/kata-integration.spec +++ b/kata_integration.spec @@ -1,8 +1,8 @@ %global debug_package %{nil} %define VERSION v1.0.0 -%define RELEASE 2 +%define RELEASE 3 -Name: kata-integration +Name: kata_integration Version: %{VERSION} Release: %{RELEASE} Summary: Kata Container integration @@ -28,6 +28,9 @@ This is a usefult tool for building Kata Container components. %doc %changelog +* Wed Aug 31 2022 tianlijing - 1.0.0-3 +- change name + * Sat Sep 5 2020 jiangpengf - 1.0.0-2 - Type:enhancement - ID:NA