From eb9a1b1b564c8655b7f6b2cf0da00a8eef10322d Mon Sep 17 00:00:00 2001 From: vegbir Date: Mon, 23 Sep 2024 09:16:53 +0000 Subject: [PATCH] rubik: fix loong64 build error Signed-off-by: vegbir --- VERSION-vendor | 2 +- rubik.spec | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/VERSION-vendor b/VERSION-vendor index 02df657..c5a2781 100644 --- a/VERSION-vendor +++ b/VERSION-vendor @@ -1 +1 @@ -2.0.0-7 +2.0.0-8 diff --git a/rubik.spec b/rubik.spec index 3affdc0..36d8eb0 100644 --- a/rubik.spec +++ b/rubik.spec @@ -1,6 +1,6 @@ Name: rubik Version: 2.0.0 -Release: 7 +Release: 8 Summary: Hybrid Deployment for Cloud Native License: Mulan PSL V2 URL: https://gitee.com/openeuler/rubik @@ -30,6 +30,9 @@ cp %{SOURCE7} . %build sh ./apply-patch +%ifarch loongarch64 +sed -i -e 's/riscv64 s390x/riscv64 s390x loong64/g' -e 's/s390x)/s390x || loong64)/g' vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_64.go +%endif make release strip ./build/rubik @@ -56,18 +59,24 @@ install -Dp ./build_rubik_image.sh %{buildroot}%{_sharedstatedir}/%{name}/build_ rm -rf %{buildroot} %changelog -* Fri Sep 20 2024 wujing - 2.0.0-7 +* Fri Sep 20 2024 wujing - 2.0.0-8 - Type: bugfix - CVE:NA - SUG:restart - DESC:sync upstream patches -* Tue Aug 20 2024 vegbir - 2.0.0-6 +* Tue Aug 20 2024 vegbir - 2.0.0-7 - Type: bugfix - CVE:NA - SUG:restart - DESC:informer add nri support +* Tue Jul 02 2024 zhangxianting - 2.0.0-6 +- Type:bugfix +- CVE:NA +- SUG:restart +- DESC:fix loong64 build error + * Tue May 21 2024 weiyuan - 2.0.0-5 - Type: bugfix - CVE:NA