From 267a7011ff6b2e3e7bb28951aaea3396150a42dd Mon Sep 17 00:00:00 2001 From: dongyuzhen Date: Thu, 15 May 2025 10:47:14 +0800 Subject: [PATCH] sync from upstream (cherry picked from commit fb56a1d4f1f48a8070fcb3aa5816317ed9c374d7) --- ...move-lxc-build-in-CI-to-avoid-failed.patch | 43 +++++++++++++++++++ lcr.spec | 9 +++- 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 0028-bugfix-remove-lxc-build-in-CI-to-avoid-failed.patch diff --git a/0028-bugfix-remove-lxc-build-in-CI-to-avoid-failed.patch b/0028-bugfix-remove-lxc-build-in-CI-to-avoid-failed.patch new file mode 100644 index 0000000..1e453b5 --- /dev/null +++ b/0028-bugfix-remove-lxc-build-in-CI-to-avoid-failed.patch @@ -0,0 +1,43 @@ +From 10de982d259a9798bcd0fc0eb8df24b5d22513ad Mon Sep 17 00:00:00 2001 +From: zhongtao +Date: Tue, 8 Apr 2025 17:24:09 +1400 +Subject: [PATCH] bugfix:remove lxc build in CI to avoid failed + +Signed-off-by: zhongtao +--- + CI/pr-gateway.sh | 14 +------------- + 1 file changed, 1 insertion(+), 13 deletions(-) + +diff --git a/CI/pr-gateway.sh b/CI/pr-gateway.sh +index 73c3bc5..1ab4ecc 100755 +--- a/CI/pr-gateway.sh ++++ b/CI/pr-gateway.sh +@@ -28,24 +28,12 @@ pip3 install meson ninja + + cd ~ + +-rm -rf lxc +-git clone https://gitee.com/src-openeuler/lxc.git +-pushd lxc +-rm -rf lxc-5.0.2 +-./apply-patches || exit 1 +-pushd lxc-5.0.2 +-mkdir -p build +-meson setup -Dtests=true -Dprefix=/usr build || exit 1 +-meson install -C build || exit 1 +-popd +-popd +- + ldconfig + pushd lcr + rm -rf build + mkdir build + pushd build +-cmake -DDEBUG=ON -DCMAKE_SKIP_RPATH=TRUE -DENABLE_UT=ON ../ || exit 1 ++cmake -DDEBUG=ON -DENABLE_LIBLCR=OFF -DCMAKE_SKIP_RPATH=TRUE -DENABLE_UT=ON ../ || exit 1 + make -j $(nproc) || exit 1 + make install || exit 1 + popd +-- +2.43.0 + diff --git a/lcr.spec b/lcr.spec index fa9af7f..60194e5 100644 --- a/lcr.spec +++ b/lcr.spec @@ -1,5 +1,5 @@ %global _version 2.1.4 -%global _release 14 +%global _release 15 %global _inner_name isula_libutils %global enable_lxc 1 @@ -40,6 +40,7 @@ Patch0024: 0024-Use-any-type-instead-of-bytearray.patch Patch0025: 0025-fix-issues-Isula-ps-cannot-display-port-mapping.patch Patch0026: 0026-sandboxer-add-image-type.patch Patch0027: 0027-move-sandbox-network_ready-from-metadata-to-state-fo.patch +Patch0028: 0028-bugfix-remove-lxc-build-in-CI-to-avoid-failed.patch %define lxcver_lower 4.0.3-2022102400 %define lxcver_upper 5.0.3 @@ -160,6 +161,12 @@ rm -rf %{buildroot} %{_includedir}/lcr/utils_compile.h %changelog +* Thu May 15 2025 dongyuzhen - 2.1.4-15 +- Type:enhancement +- CVE:NA +- SUG:NA +- DESC:sync from upstream + * Mon May 12 2025 dongyuzhen - 2.1.4-14 - Type:enhancement - CVE:NA -- Gitee