diff --git a/apply-patches-loongarch64 b/apply-patches-loongarch64 new file mode 100755 index 0000000000000000000000000000000000000000..a9c55be1db8b3fd670524aecf54fd4071970464f --- /dev/null +++ b/apply-patches-loongarch64 @@ -0,0 +1,9 @@ +#!/bin/bash +cat ./series-loongarch64.conf | while read line +do + if [[ $line == '' || $line =~ ^\s*# ]]; then + continue + fi + echo "====patch $line======" + patch -p1 -F1 -s < ./patches/$line +done diff --git a/kata-containers.spec b/kata-containers.spec index e072ecb9675277d750d6f9a46548532031c069a4..fd8235337ed15ff5da38eba2077845f25e082e7d 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -2,7 +2,7 @@ %global debug_package %{nil} %define VERSION 3.2.0 -%define RELEASE 9 +%define RELEASE 10 Name: kata-containers Version: %{VERSION} @@ -49,8 +49,12 @@ cp %{_builddir}/kata_integration/hack/config-kata-arm64 ./.config %endif cd %{_builddir}/kata-containers/ -tar -xzf kata-containers-%{version}-vendor.tar.gz sh -x apply-patches +tar -xzf kata-containers-%{version}-vendor.tar.gz + +%ifarch loongarch64 +sh -x apply-patches-loongarch64 +%endif %build cd %{_builddir}/kernel/linux/ @@ -122,6 +126,12 @@ strip %{buildroot}/usr/bin/containerd-shim-kata-v2 %doc %changelog +* Thu Sep 11 2025 dongyuzhen - 3.2.0-10 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:fix build error for kata-containers + * Mon Sep 08 2025 Wenlong Zhang - 3.2.0-9 - Type:bugfix - ID:NA diff --git a/series-loongarch64.conf b/series-loongarch64.conf new file mode 100644 index 0000000000000000000000000000000000000000..d2a5611b83dae21298cf65ffaa87149d5202d592 --- /dev/null +++ b/series-loongarch64.conf @@ -0,0 +1,2 @@ +0010-add-loongarch64-support-for-nix.patch +0011-add-loongarch64-support-for-kata-containers.patch diff --git a/series.conf b/series.conf index 50463c1c8d4a8d5b3ab4fcb75838b5938d4091ad..661113a9d3783ecc4ece5c7cb8a04024a7881e84 100644 --- a/series.conf +++ b/series.conf @@ -7,5 +7,3 @@ 0007-Add-support-for-riscv64-platform.patch 0008-add-compilation-options-to-runtime-directory.patch 0009-kata-runtime-9p-use-cache-none.patch -0010-add-loongarch64-support-for-nix.patch -0011-add-loongarch64-support-for-kata-containers.patch