diff --git a/0005-add-riscv64-to-syscall-build.patch b/0005-add-riscv64-to-syscall-build.patch new file mode 100644 index 0000000000000000000000000000000000000000..7c4d54b414155088b7112d1d7326352957a59d69 --- /dev/null +++ b/0005-add-riscv64-to-syscall-build.patch @@ -0,0 +1,11 @@ +diff --git a/vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_64.go b/vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_64.go +index 11c3faa..9121cce 100644 +--- a/vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_64.go ++++ b/vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_64.go +@@ -1,5 +1,5 @@ + // +build linux +-// +build arm64 amd64 mips mipsle mips64 mips64le ppc ppc64 ppc64le s390x ++// +build arm64 amd64 mips mipsle mips64 mips64le ppc ppc64 ppc64le s390x riscv64 + + package system + diff --git a/lxcfs-tools.spec b/lxcfs-tools.spec index cf33a467a99bc1c8b1983be2efdf4feb664660df..a9de7bbec2e744f605000a8f0f244fe755335747 100644 --- a/lxcfs-tools.spec +++ b/lxcfs-tools.spec @@ -1,7 +1,7 @@ #Basic Information Name: lxcfs-tools Version: 0.3 -Release: 30 +Release: 32 Summary: toolkit for lxcfs to remount a running isulad License: Mulan PSL v2 URL: https://gitee.com/openeuler/lxcfs-tools @@ -12,8 +12,14 @@ Patch1: 0001-lxcfs-tools-build-security-option.patch Patch2: 0002-enable-external-linkmode-for-cgo-build.patch Patch3: 0003-retry-10-times-to-avoid-isulad-unavailable.patch Patch4: 0004-add-dt-test.patch -Patch5: lxcfs-tools-sw.patch -Patch6: add-loong64-support.patch +Patch5: 0005-add-riscv64-to-syscall-build.patch + +%ifarch sw_64 +Patch1000: lxcfs-tools-sw.patch +%endif +%ifarch loongarch64 +Patch1001: add-loong64-support.patch +%endif #Dependency BuildRequires: golang > 1.7 @@ -26,13 +32,6 @@ A toolkit for lxcfs to remount a running isulad when crashes recover #Build sections %prep %autosetup -n %{name}-v%{version} -p1 -%ifnarch sw_64 loongarch64 -%patch6 -R -p1 -%patch5 -R -p1 -%endif -%ifarch sw_64 -%patch6 -R -p1 -%endif %build make @@ -56,8 +55,8 @@ make tests %preun %post -GRAPH=`isula info | grep -Eo "iSulad Root Dir:.+" | grep -Eo "\/.*"` -if [ "$GRAPH" == "" ]; then +GRAPH=`isula info 2>/dev/null | grep -Eo "iSulad Root Dir:.+" | grep -Eo "/.*"` +if [ x"$GRAPH" == "x" ]; then GRAPH="/var/lib/isulad" fi @@ -105,6 +104,15 @@ rm -rfv %{buildroot} %changelog +* Wed Dec 27 2023 yangjiaqi - 0.3-32 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:hide error when isula info is abnormal + +* Mon Jul 03 2023 wujie - 0.3-31 +- add riscv64 to syscall_linux_64.go build + * Tue Feb 14 2023 huajingyun - 0.3-30 - add loongarch support for lxcfs-tools