add riscv64 to syscall_linux_64.go build

This commit is contained in:
wujie 2023-07-01 14:04:58 +08:00 committed by laokz
parent 8c295f368d
commit 184f48f231
3 changed files with 20 additions and 5 deletions

View File

@ -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

4
lxcfs-tools-sw.patch Executable file → Normal file
View File

@ -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 +++ 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 @@ @@ -1,5 +1,5 @@
// +build linux // +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
+// +build arm64 amd64 mips mipsle mips64 mips64le ppc ppc64 ppc64le s390x sw64 +// +build arm64 amd64 mips mipsle mips64 mips64le ppc ppc64 ppc64le s390x riscv64 sw64
package system package system

View File

@ -1,7 +1,7 @@
#Basic Information #Basic Information
Name: lxcfs-tools Name: lxcfs-tools
Version: 0.3 Version: 0.3
Release: 29 Release: 30
Summary: toolkit for lxcfs to remount a running isulad Summary: toolkit for lxcfs to remount a running isulad
License: Mulan PSL v2 License: Mulan PSL v2
URL: https://gitee.com/openeuler/lxcfs-tools 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 Patch2: 0002-enable-external-linkmode-for-cgo-build.patch
Patch3: 0003-retry-10-times-to-avoid-isulad-unavailable.patch Patch3: 0003-retry-10-times-to-avoid-isulad-unavailable.patch
Patch4: 0004-add-dt-test.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 #Dependency
BuildRequires: golang > 1.7 BuildRequires: golang > 1.7
@ -26,7 +27,7 @@ A toolkit for lxcfs to remount a running isulad when crashes recover
%prep %prep
%autosetup -n %{name}-v%{version} -p1 %autosetup -n %{name}-v%{version} -p1
%ifnarch sw_64 %ifnarch sw_64
%patch5 -R -p1 %patch6 -R -p1
%endif %endif
%build %build
@ -100,6 +101,9 @@ rm -rfv %{buildroot}
%changelog %changelog
* Mon Jul 03 2023 wujie <wujie@nj.iscas.ac.cn> - 0.3-30
- add riscv64 to syscall_linux_64.go build
* Thu Nov 17 2022 yangjiaqi<yangjiaqi16@huawei.com> - 0.3-29 * Thu Nov 17 2022 yangjiaqi<yangjiaqi16@huawei.com> - 0.3-29
- fix source - fix source