From 184f48f2317bcccb278e7ab4deb16c9a781d33a8 Mon Sep 17 00:00:00 2001 From: wujie Date: Sat, 1 Jul 2023 14:04:58 +0800 Subject: [PATCH] add riscv64 to syscall_linux_64.go build --- 0005-add-riscv64-to-syscall-build.patch | 11 +++++++++++ lxcfs-tools-sw.patch | 4 ++-- lxcfs-tools.spec | 10 +++++++--- 3 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 0005-add-riscv64-to-syscall-build.patch mode change 100755 => 100644 lxcfs-tools-sw.patch diff --git a/0005-add-riscv64-to-syscall-build.patch b/0005-add-riscv64-to-syscall-build.patch new file mode 100644 index 0000000..7c4d54b --- /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-sw.patch b/lxcfs-tools-sw.patch old mode 100755 new mode 100644 index 7f47b51..447c638 --- a/lxcfs-tools-sw.patch +++ b/lxcfs-tools-sw.patch @@ -32,8 +32,8 @@ diff -Nuar lxcfs-tools.org/vendor/github.com/opencontainers/runc/libcontainer/sy +++ lxcfs-tools.sw/vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_64.go 2022-10-24 12:38:47.127502830 +0800 @@ -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 sw64 +-// +build arm64 amd64 mips mipsle mips64 mips64le ppc ppc64 ppc64le s390x riscv64 ++// +build arm64 amd64 mips mipsle mips64 mips64le ppc ppc64 ppc64le s390x riscv64 sw64 package system diff --git a/lxcfs-tools.spec b/lxcfs-tools.spec index a40173b..c14e515 100644 --- a/lxcfs-tools.spec +++ b/lxcfs-tools.spec @@ -1,7 +1,7 @@ #Basic Information Name: lxcfs-tools Version: 0.3 -Release: 29 +Release: 30 Summary: toolkit for lxcfs to remount a running isulad License: Mulan PSL v2 URL: https://gitee.com/openeuler/lxcfs-tools @@ -12,7 +12,8 @@ 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 +Patch5: 0005-add-riscv64-to-syscall-build.patch +Patch6: lxcfs-tools-sw.patch #Dependency BuildRequires: golang > 1.7 @@ -26,7 +27,7 @@ A toolkit for lxcfs to remount a running isulad when crashes recover %prep %autosetup -n %{name}-v%{version} -p1 %ifnarch sw_64 -%patch5 -R -p1 +%patch6 -R -p1 %endif %build @@ -100,6 +101,9 @@ rm -rfv %{buildroot} %changelog +* Mon Jul 03 2023 wujie - 0.3-30 +- add riscv64 to syscall_linux_64.go build + * Thu Nov 17 2022 yangjiaqi - 0.3-29 - fix source -- Gitee