packages/syscontainer-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add riscv64 support

Browse Source
This commit is contained in:
wujie 2023-06-30 11:09:55 +08:00 committed by laokz
parent 87b9a320be
commit 2f41a79e80
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
0005-add-riscv64-to-syscall-build.patch Normal file
View File

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

4
0005-syscontainer-tools-Add-sw64-architecture.patch
View File

@ -62,8 +62,8 @@ index 0816bf8..cea2a9b 100644
--- a/vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_64.go --- a/vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_64.go
+++ b/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 @@ @@ -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
+// +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 linux,sw64
package system package system

10
syscontainer-tools.spec
View File

@ -1,7 +1,7 @@
#Basic Information #Basic Information
Name: syscontainer-tools Name: syscontainer-tools
Version: 0.9 Version: 0.9
Release: 52 Release: 53
Summary: syscontainer tools for IT, work with iSulad Summary: syscontainer tools for IT, work with iSulad
License: Mulan PSL v2 License: Mulan PSL v2
URL: https://gitee.com/openeuler/syscontainer-tools 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 Patch2: 0002-syscontainer-tools-build-security-option.patch
Patch3: 0003-enable-external-linkmode-for-cgo-build.patch Patch3: 0003-enable-external-linkmode-for-cgo-build.patch
Patch4: 0004-add-dt-test.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 #Dependency
BuildRequires: glibc-static BuildRequires: glibc-static
@ -27,7 +28,7 @@ This is syscontainer tools, to make it work, you need a isulad and util-linux
%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
@ -117,6 +118,9 @@ chmod 0640 ${HOOK_SPEC}/hookspec.json
rm -rfv %{buildroot} rm -rfv %{buildroot}
%changelog %changelog
* Fri Jun 30 2023 wujie <wujie@nj.iscas.ac.cn> - 0.9-53
- add riscv64 to syscall_linux_64.go build
* Thu Nov 17 2022 yangjiaqi<yangjiaqi16@huawei.com> - 0.9-52 * Thu Nov 17 2022 yangjiaqi<yangjiaqi16@huawei.com> - 0.9-52
- fix source - fix source