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

!77 sync from 2203 SP1

Browse Source 
From: @vegbir 
Reviewed-by: @jingwoo 
Signed-off-by: @jingwoo
This commit is contained in:
openeuler-ci-bot 2024-04-01 07:27:39 +00:00 committed by Gitee
commit 1b5ad3e2a5
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 36 additions and 226368 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
0008-add-loong64-and-sw64-to-syscall-build.patch Normal file
View File

@ -0,0 +1,24 @@
From e5fbfd2fc794f4b05c5ee7d812f7951a5270a758 Mon Sep 17 00:00:00 2001
From: yangchenguang <yangchenguang@kylinsec.com.cn>
Date: Mon, 26 Feb 2024 09:57:09 +0800
Subject: [PATCH] add loong64 and sw64 to syscall build
Signed-off-by: yangchenguang <yangchenguang@kylinsec.com.cn>
---
.../opencontainers/runc/libcontainer/system/syscall_linux_64.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 9121cce..d5a173e 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 riscv64
+// +build arm64 amd64 mips mipsle mips64 mips64le ppc ppc64 ppc64le s390x riscv64 loong64 sw64
package system
--
2.39.1

226334
add-loong64-support.patch
View File

File diff suppressed because it is too large Load Diff

28
lxcfs-tools-sw.patch
View File

@ -1,21 +1,3 @@
diff -Nuar lxcfs-tools.org/Makefile lxcfs-tools.sw/Makefile
--- lxcfs-tools.org/Makefile 2022-10-24 12:38:57.272620912 +0800
+++ lxcfs-tools.sw/Makefile 2022-10-24 12:38:47.189503552 +0800
@@ -34,12 +34,12 @@
toolkit: $(SOURCES) | $(DEPS_LINK)
@echo "Making lxcfs-tools..."
- ${ENV} go build -buildmode=pie -mod=vendor -tags ${TAGS} -ldflags ${GO_LDFLAGS} -o build/lxcfs-tools .
+ ${ENV} go build -mod=vendor -tags ${TAGS} -ldflags ${GO_LDFLAGS} -o build/lxcfs-tools .
@echo "Done!"
lxcfs-hook: $(SOURCES) | $(DEPS_LINK)
@echo "Making lxcfs-hook..."
- ${ENV} go build -buildmode=pie -mod=vendor -tags ${TAGS} -ldflags ${GO_LDFLAGS} -o build/lxcfs-hook ./hooks/lxcfs-hook
+ ${ENV} go build -mod=vendor -tags ${TAGS} -ldflags ${GO_LDFLAGS} -o build/lxcfs-hook ./hooks/lxcfs-hook
@echo "Done!"
tests:
diff -Nuar lxcfs-tools.org/vendor/github.com/opencontainers/runc/libcontainer/seccomp/config.go lxcfs-tools.sw/vendor/github.com/opencontainers/runc/libcontainer/seccomp/config.go
--- lxcfs-tools.org/vendor/github.com/opencontainers/runc/libcontainer/seccomp/config.go 2022-10-24 12:38:57.210620191 +0800
+++ lxcfs-tools.sw/vendor/github.com/opencontainers/runc/libcontainer/seccomp/config.go 2022-10-24 12:38:47.127502830 +0800
@ -27,16 +9,6 @@ diff -Nuar lxcfs-tools.org/vendor/github.com/opencontainers/runc/libcontainer/se
"SCMP_ARCH_MIPS": "mips",
"SCMP_ARCH_MIPS64": "mips64",
"SCMP_ARCH_MIPS64N32": "mips64n32",
diff -Nuar lxcfs-tools.org/vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_64.go lxcfs-tools.sw/vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_64.go
--- lxcfs-tools.org/vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_64.go 2022-10-24 12:38:57.204620121 +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 @@
// +build linux
-// +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 -Nuar lxcfs-tools.org/vendor/github.com/opencontainers/runtime-spec/specs-go/config.go lxcfs-tools.sw/vendor/github.com/opencontainers/runtime-spec/specs-go/config.go
--- lxcfs-tools.org/vendor/github.com/opencontainers/runtime-spec/specs-go/config.go 2022-10-24 12:38:57.219620296 +0800
+++ lxcfs-tools.sw/vendor/github.com/opencontainers/runtime-spec/specs-go/config.go 2022-10-24 12:38:47.146503051 +0800

18
lxcfs-tools.spec
View File

@ -1,7 +1,7 @@
#Basic Information
Name: lxcfs-tools
Version: 0.3
Release: 33
Release: 34
Summary: toolkit for lxcfs to remount a running isulad
License: Mulan PSL v2
URL: https://gitee.com/openeuler/lxcfs-tools
@ -15,13 +15,9 @@ Patch4: 0004-add-dt-test.patch
Patch5: 0005-add-riscv64-to-syscall-build.patch
Patch6: 0006-lxcfs-tools-support-lxcfs-reliability-for-doc.patch
Patch7: 0007-test-add-tests-for-docker-and-lxcfs.patch
Patch8: 0008-add-loong64-and-sw64-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
@ -34,8 +30,15 @@ A toolkit for lxcfs to remount a running isulad when crashes recover
#Build sections
%prep
%autosetup -n %{name}-v%{version} -p1
%ifarch loongarch64
rm -fr vendor/golang.org/x/sys
cp -arf %{_prefix}/lib/golang/src/cmd/vendor/golang.org/x/sys vendor/golang.org/x/
%endif
%build
%ifarch sw_64
sed -i 's/-buildmode=pie//g' Makefile
%endif
make
%install
@ -106,6 +109,9 @@ rm -rfv %{buildroot}
%changelog
* Thu Feb 22 2024 yangchenguang <yangchenguang@kylinsec.com.cn> - 0.3-34
- Modify architecture support patch
* Fri Feb 2 2024 yangjiaqi <yangjiaqi16@huawei.com> - 0.3-33
- Type:bugfix
- CVE:NA