From 2f41a79e80a3998b9f52ea29465124da8e9b9c13 Mon Sep 17 00:00:00 2001 From: wujie Date: Fri, 30 Jun 2023 11:09:55 +0800 Subject: [PATCH] add riscv64 support --- 0005-add-riscv64-to-syscall-build.patch | 10 ++++++++++ 0005-syscontainer-tools-Add-sw64-architecture.patch | 4 ++-- syscontainer-tools.spec | 10 +++++++--- 3 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 0005-add-riscv64-to-syscall-build.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..e2209c5 --- /dev/null +++ b/0005-add-riscv64-to-syscall-build.patch @@ -0,0 +1,10 @@ +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 0816bf8..7ddb662 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,4 +1,4 @@ +-// +build linux,arm64 linux,amd64 linux,ppc linux,ppc64 linux,ppc64le linux,s390x ++// +build linux,arm64 linux,amd64 linux,ppc linux,ppc64 linux,ppc64le linux,s390x linux,riscv64 + + package system + diff --git a/0005-syscontainer-tools-Add-sw64-architecture.patch b/0005-syscontainer-tools-Add-sw64-architecture.patch index cb8e7cd..156fb92 100644 --- a/0005-syscontainer-tools-Add-sw64-architecture.patch +++ b/0005-syscontainer-tools-Add-sw64-architecture.patch @@ -62,8 +62,8 @@ index 0816bf8..cea2a9b 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,4 +1,4 @@ --// +build linux,arm64 linux,amd64 linux,ppc linux,ppc64 linux,ppc64le linux,s390x -+// +build linux,arm64 linux,amd64 linux,ppc linux,ppc64 linux,ppc64le linux,s390x linux,sw64 +-// +build linux,arm64 linux,amd64 linux,ppc linux,ppc64 linux,ppc64le linux,s390x linux,riscv64 ++// +build linux,arm64 linux,amd64 linux,ppc linux,ppc64 linux,ppc64le linux,s390x linux,riscv64 linux,sw64 package system diff --git a/syscontainer-tools.spec b/syscontainer-tools.spec index 5babe1b..24c706f 100644 --- a/syscontainer-tools.spec +++ b/syscontainer-tools.spec @@ -1,7 +1,7 @@ #Basic Information Name: syscontainer-tools Version: 0.9 -Release: 52 +Release: 53 Summary: syscontainer tools for IT, work with iSulad License: Mulan PSL v2 URL: https://gitee.com/openeuler/syscontainer-tools @@ -12,7 +12,8 @@ Patch1: 0001-fix-failed-build-with-golang-1.15.5.patch Patch2: 0002-syscontainer-tools-build-security-option.patch Patch3: 0003-enable-external-linkmode-for-cgo-build.patch Patch4: 0004-add-dt-test.patch -Patch5: 0005-syscontainer-tools-Add-sw64-architecture.patch +Patch5: 0005-add-riscv64-to-syscall-build.patch +Patch6: 0005-syscontainer-tools-Add-sw64-architecture.patch #Dependency BuildRequires: glibc-static @@ -27,7 +28,7 @@ This is syscontainer tools, to make it work, you need a isulad and util-linux %prep %autosetup -n %{name}-v%{version} -p1 %ifnarch sw_64 -%patch5 -R -p1 +%patch6 -R -p1 %endif %build @@ -117,6 +118,9 @@ chmod 0640 ${HOOK_SPEC}/hookspec.json rm -rfv %{buildroot} %changelog +* Fri Jun 30 2023 wujie - 0.9-53 +- add riscv64 to syscall_linux_64.go build + * Thu Nov 17 2022 yangjiaqi - 0.9-52 - fix source