diff --git a/kata-containers.spec b/kata-containers.spec index a05b33c7283c974d7ac671ffdd33ab6ed5cc9bad..c4aac73d09d0a3302251cc49e844c48a3f706707 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -2,7 +2,7 @@ %global debug_package %{nil} %define VERSION 2.1.0 -%define RELEASE 33 +%define RELEASE 34 Name: kata-containers Version: %{VERSION} @@ -27,7 +27,7 @@ This is core component of Kata Container, to make it work, you need a isulad/doc %setup -T -c -a 2 -n kernel # extract the kata_integration.tar.gz file -cd %{_builddir}/kata_integration +cd %{_builddir}/kata_integration/kata_integration-openeuler # apply kata_integration patches sh apply-patches @@ -36,9 +36,9 @@ cd %{_builddir}/kernel mv kernel linux cd %{_builddir}/kernel/linux/ %ifarch %{ix86} x86_64 -cp %{_builddir}/kata_integration/hack/config-kata-x86_64 ./.config +cp %{_builddir}/kata_integration/kata_integration-openeuler/hack/config-kata-x86_64 ./.config %else -cp %{_builddir}/kata_integration/hack/config-kata-arm64 ./.config +cp %{_builddir}/kata_integration/kata_integration-openeuler/hack/config-kata-arm64 ./.config %endif %build @@ -47,14 +47,14 @@ make olddefconfig make %{?_smp_mflags} mv %{_builddir}/kata-containers-%{version} %{_builddir}/kata-containers -cd %{_builddir}/kata-containers/ +cd %{_builddir}/kata-containers/kata-containers-openeuler sh -x apply-patches -cd %{_builddir}/kata-containers/src/runtime +cd %{_builddir}/kata-containers/kata-containers-openeuler/src/runtime make clean make -cd %{_builddir}/kata-containers/src/agent -mkdir vendor && tar -xzf %{_builddir}/kata-containers/vendor.tar.gz -C vendor/ +cd %{_builddir}/kata-containers/kata-containers-openeuler/src/agent +mkdir vendor && tar -xzf %{_builddir}/kata-containers/kata-containers-openeuler/vendor.tar.gz -C vendor/ cp -f ./vendor/version.rs ./src/ cat > .cargo/config << EOF [build] @@ -67,9 +67,9 @@ replace-with = "vendored-sources" directory = "vendor" EOF /usr/bin/env CARGO_HOME=.cargo RUSTC_BOOTSTRAP=1 cargo build --release -cd %{_builddir}/kata_integration +cd %{_builddir}/kata_integration/kata_integration-openeuler mkdir -p -m 750 build -cp %{_builddir}/kata-containers/src/agent/target/release/kata-agent ./build/ +cp %{_builddir}/kata-containers/kata-containers-openeuler/src/agent/target/release/kata-agent ./build/ strip ./build/kata-agent make initrd @@ -81,14 +81,14 @@ install -p -m 755 -D %{_builddir}/kernel/linux/arch/x86_64/boot/bzImage %{buildr install -p -m 755 -D %{_builddir}/kernel/linux/arch/arm64/boot/Image %{buildroot}/var/lib/kata/kernel %endif -cd %{_builddir}/kata_integration +cd %{_builddir}/kata_integration/kata_integration-openeuler mkdir -p -m 750 %{buildroot}/usr/bin -install -p -m 750 %{_builddir}/kata-containers/src/runtime/kata-runtime %{buildroot}/usr/bin/ -install -p -m 750 %{_builddir}/kata-containers/src/runtime/kata-netmon %{buildroot}/usr/bin/ -install -p -m 750 %{_builddir}/kata-containers/src/runtime/kata-monitor %{buildroot}/usr/bin/ -install -p -m 750 %{_builddir}/kata-containers/src/runtime/containerd-shim-kata-v2 %{buildroot}/usr/bin/ -install -p -m 640 -D %{_builddir}/kata-containers/src/runtime/cli/config/configuration-qemu.toml %{buildroot}/usr/share/defaults/kata-containers/configuration.toml -install -p -m 640 -D %{_builddir}/kata-containers/src/runtime/cli/config/configuration-stratovirt.toml %{buildroot}/usr/share/defaults/kata-containers/configuration-stratovirt.toml +install -p -m 750 %{_builddir}/kata-containers/kata-containers-openeuler/src/runtime/kata-runtime %{buildroot}/usr/bin/ +install -p -m 750 %{_builddir}/kata-containers/kata-containers-openeuler/src/runtime/kata-netmon %{buildroot}/usr/bin/ +install -p -m 750 %{_builddir}/kata-containers/kata-containers-openeuler/src/runtime/kata-monitor %{buildroot}/usr/bin/ +install -p -m 750 %{_builddir}/kata-containers/kata-containers-openeuler/src/runtime/containerd-shim-kata-v2 %{buildroot}/usr/bin/ +install -p -m 640 -D %{_builddir}/kata-containers/kata-containers-openeuler/src/runtime/cli/config/configuration-qemu.toml %{buildroot}/usr/share/defaults/kata-containers/configuration.toml +install -p -m 640 -D %{_builddir}/kata-containers/kata-containers-openeuler/src/runtime/cli/config/configuration-stratovirt.toml %{buildroot}/usr/share/defaults/kata-containers/configuration-stratovirt.toml install -p -m 640 ./build/kata-containers-initrd.img %{buildroot}/var/lib/kata/ mkdir -p -m 750 %{buildroot}/usr/share/defaults/kata-containers/ strip %{buildroot}/usr/bin/kata* @@ -109,6 +109,12 @@ strip %{buildroot}/usr/bin/containerd-shim-kata-v2 %doc %changelog +* Fri Sep 2023 luofeng - 2.1.0-34 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: fix apply-patches: No such file or directory + * Tue Sep 2023 xiadanni - 2.1.0-33 - Type:bugfix - ID:NA @@ -365,4 +371,4 @@ strip %{buildroot}/usr/bin/containerd-shim-kata-v2 - Type:enhancement - ID:NA - SUG:NA -- DESC:update kata-containers version to v1.11.1-1 +- DESC:update kata-containers version to v1.11.1-1 \ No newline at end of file