diff --git a/lxcfs-tools-sw.patch b/lxcfs-tools-sw.patch index 447c6387f133b66ab2013e47f039ca96681ad30b..84fa6baf7ee471a85076e6e710fc19d51df37356 100644 --- a/lxcfs-tools-sw.patch +++ b/lxcfs-tools-sw.patch @@ -1,25 +1,34 @@ -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 -@@ -30,6 +30,7 @@ +From da4aa3297fe24db17ec599df40ed9f94b0615b47 Mon Sep 17 00:00:00 2001 +From: Hailiang +Date: Tue, 18 Mar 2025 13:19:38 +0800 +Subject: [PATCH] lxcfs-tools sw + +--- + .../runc/libcontainer/seccomp/config.go | 1 + + .../libcontainer/system/syscall_linux_64.go | 2 +- + .../runtime-spec/specs-go/config.go | 1 + + .../seccomp/libseccomp-golang/seccomp.go | 6 + + .../libseccomp-golang/seccomp_internal.go | 5 + + vendor/golang.org/x/sys/unix/asm_linux_sw64.s | 57 + + vendor/golang.org/x/sys/unix/endian_little.go | 2 +- + .../x/sys/unix/syscall_linux_sw64.go | 261 ++ + .../x/sys/unix/zerrors_linux_sw64.go | 3208 ++++++++++++++++ + .../x/sys/unix/zsyscall_linux_sw64.go | 2649 +++++++++++++ + .../x/sys/unix/zsysnum_linux_sw64.go | 458 +++ + .../x/sys/unix/ztypes_linux_sw64.go | 3361 +++++++++++++++++ + 12 files changed, 10009 insertions(+), 2 deletions(-) + create mode 100644 vendor/golang.org/x/sys/unix/asm_linux_sw64.s + create mode 100644 vendor/golang.org/x/sys/unix/syscall_linux_sw64.go + create mode 100644 vendor/golang.org/x/sys/unix/zerrors_linux_sw64.go + create mode 100644 vendor/golang.org/x/sys/unix/zsyscall_linux_sw64.go + create mode 100644 vendor/golang.org/x/sys/unix/zsysnum_linux_sw64.go + create mode 100644 vendor/golang.org/x/sys/unix/ztypes_linux_sw64.go + +diff --git a/vendor/github.com/opencontainers/runc/libcontainer/seccomp/config.go b/vendor/github.com/opencontainers/runc/libcontainer/seccomp/config.go +index ded5a6b..7a0b74c 100644 +--- a/vendor/github.com/opencontainers/runc/libcontainer/seccomp/config.go ++++ b/vendor/github.com/opencontainers/runc/libcontainer/seccomp/config.go +@@ -30,6 +30,7 @@ var archs = map[string]string{ "SCMP_ARCH_X32": "x32", "SCMP_ARCH_ARM": "arm", "SCMP_ARCH_AARCH64": "arm64", @@ -27,9 +36,10 @@ 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 +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..c455d72 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 @@ -37,10 +47,11 @@ diff -Nuar lxcfs-tools.org/vendor/github.com/opencontainers/runc/libcontainer/sy 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 -@@ -505,6 +505,7 @@ +diff --git a/vendor/github.com/opencontainers/runtime-spec/specs-go/config.go b/vendor/github.com/opencontainers/runtime-spec/specs-go/config.go +index 71c9fa7..402da8e 100644 +--- a/vendor/github.com/opencontainers/runtime-spec/specs-go/config.go ++++ b/vendor/github.com/opencontainers/runtime-spec/specs-go/config.go +@@ -505,6 +505,7 @@ const ( ArchX32 Arch = "SCMP_ARCH_X32" ArchARM Arch = "SCMP_ARCH_ARM" ArchAARCH64 Arch = "SCMP_ARCH_AARCH64" @@ -48,10 +59,11 @@ diff -Nuar lxcfs-tools.org/vendor/github.com/opencontainers/runtime-spec/specs-g ArchMIPS Arch = "SCMP_ARCH_MIPS" ArchMIPS64 Arch = "SCMP_ARCH_MIPS64" ArchMIPS64N32 Arch = "SCMP_ARCH_MIPS64N32" -diff -Nuar lxcfs-tools.org/vendor/github.com/seccomp/libseccomp-golang/seccomp.go lxcfs-tools.sw/vendor/github.com/seccomp/libseccomp-golang/seccomp.go ---- lxcfs-tools.org/vendor/github.com/seccomp/libseccomp-golang/seccomp.go 2022-10-24 12:38:57.175619783 +0800 -+++ lxcfs-tools.sw/vendor/github.com/seccomp/libseccomp-golang/seccomp.go 2022-10-24 12:38:47.167503296 +0800 -@@ -90,6 +90,8 @@ +diff --git a/vendor/github.com/seccomp/libseccomp-golang/seccomp.go b/vendor/github.com/seccomp/libseccomp-golang/seccomp.go +index a3cc538..7f16c91 100644 +--- a/vendor/github.com/seccomp/libseccomp-golang/seccomp.go ++++ b/vendor/github.com/seccomp/libseccomp-golang/seccomp.go +@@ -90,6 +90,8 @@ const ( ArchAMD64 ScmpArch = iota // ArchX32 represents 64-bit x86-64 syscalls (32-bit pointers) ArchX32 ScmpArch = iota @@ -60,7 +72,7 @@ diff -Nuar lxcfs-tools.org/vendor/github.com/seccomp/libseccomp-golang/seccomp.g // ArchARM represents 32-bit ARM syscalls ArchARM ScmpArch = iota // ArchARM64 represents 64-bit ARM syscalls -@@ -188,6 +190,8 @@ +@@ -188,6 +190,8 @@ func GetArchFromString(arch string) (ScmpArch, error) { return ArchAMD64, nil case "x32": return ArchX32, nil @@ -69,7 +81,7 @@ diff -Nuar lxcfs-tools.org/vendor/github.com/seccomp/libseccomp-golang/seccomp.g case "arm": return ArchARM, nil case "arm64", "aarch64": -@@ -228,6 +232,8 @@ +@@ -228,6 +232,8 @@ func (a ScmpArch) String() string { return "amd64" case ArchX32: return "x32" @@ -78,10 +90,11 @@ diff -Nuar lxcfs-tools.org/vendor/github.com/seccomp/libseccomp-golang/seccomp.g case ArchARM: return "arm" case ArchARM64: -diff -Nuar lxcfs-tools.org/vendor/github.com/seccomp/libseccomp-golang/seccomp_internal.go lxcfs-tools.sw/vendor/github.com/seccomp/libseccomp-golang/seccomp_internal.go ---- lxcfs-tools.org/vendor/github.com/seccomp/libseccomp-golang/seccomp_internal.go 2022-10-24 12:38:57.175619783 +0800 -+++ lxcfs-tools.sw/vendor/github.com/seccomp/libseccomp-golang/seccomp_internal.go 2022-10-24 12:38:47.167503296 +0800 -@@ -55,6 +55,7 @@ +diff --git a/vendor/github.com/seccomp/libseccomp-golang/seccomp_internal.go b/vendor/github.com/seccomp/libseccomp-golang/seccomp_internal.go +index 4e36b27..0df3872 100644 +--- a/vendor/github.com/seccomp/libseccomp-golang/seccomp_internal.go ++++ b/vendor/github.com/seccomp/libseccomp-golang/seccomp_internal.go +@@ -55,6 +55,7 @@ const uint32_t C_ARCH_X86 = SCMP_ARCH_X86; const uint32_t C_ARCH_X86_64 = SCMP_ARCH_X86_64; const uint32_t C_ARCH_X32 = SCMP_ARCH_X32; const uint32_t C_ARCH_ARM = SCMP_ARCH_ARM; @@ -89,7 +102,7 @@ diff -Nuar lxcfs-tools.org/vendor/github.com/seccomp/libseccomp-golang/seccomp_i const uint32_t C_ARCH_AARCH64 = SCMP_ARCH_AARCH64; const uint32_t C_ARCH_MIPS = SCMP_ARCH_MIPS; const uint32_t C_ARCH_MIPS64 = SCMP_ARCH_MIPS64; -@@ -419,6 +420,8 @@ +@@ -419,6 +420,8 @@ func archFromNative(a C.uint32_t) (ScmpArch, error) { return ArchARM, nil case C.C_ARCH_NATIVE: return ArchNative, nil @@ -98,7 +111,7 @@ diff -Nuar lxcfs-tools.org/vendor/github.com/seccomp/libseccomp-golang/seccomp_i case C.C_ARCH_AARCH64: return ArchARM64, nil case C.C_ARCH_MIPS: -@@ -459,6 +462,8 @@ +@@ -459,6 +462,8 @@ func (a ScmpArch) toNative() C.uint32_t { return C.C_ARCH_X32 case ArchARM: return C.C_ARCH_ARM @@ -107,9 +120,11 @@ diff -Nuar lxcfs-tools.org/vendor/github.com/seccomp/libseccomp-golang/seccomp_i case ArchARM64: return C.C_ARCH_AARCH64 case ArchMIPS: -diff -Nuar lxcfs-tools.org/vendor/golang.org/x/sys/unix/asm_linux_sw64.s lxcfs-tools.sw/vendor/golang.org/x/sys/unix/asm_linux_sw64.s ---- lxcfs-tools.org/vendor/golang.org/x/sys/unix/asm_linux_sw64.s 1970-01-01 08:00:00.000000000 +0800 -+++ lxcfs-tools.sw/vendor/golang.org/x/sys/unix/asm_linux_sw64.s 2022-10-24 12:38:47.064502097 +0800 +diff --git a/vendor/golang.org/x/sys/unix/asm_linux_sw64.s b/vendor/golang.org/x/sys/unix/asm_linux_sw64.s +new file mode 100644 +index 0000000..76ee193 +--- /dev/null ++++ b/vendor/golang.org/x/sys/unix/asm_linux_sw64.s @@ -0,0 +1,57 @@ +// Copyright 2015 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style @@ -168,9 +183,10 @@ diff -Nuar lxcfs-tools.org/vendor/golang.org/x/sys/unix/asm_linux_sw64.s lxcfs-t + STL R0, r1+32(FP) + STL R20, r2+40(FP) + RET -diff -Nuar lxcfs-tools.org/vendor/golang.org/x/sys/unix/endian_little.go lxcfs-tools.sw/vendor/golang.org/x/sys/unix/endian_little.go ---- lxcfs-tools.org/vendor/golang.org/x/sys/unix/endian_little.go 2022-10-24 12:38:57.270620889 +0800 -+++ lxcfs-tools.sw/vendor/golang.org/x/sys/unix/endian_little.go 2022-10-24 12:38:47.113502666 +0800 +diff --git a/vendor/golang.org/x/sys/unix/endian_little.go b/vendor/golang.org/x/sys/unix/endian_little.go +index bcdb5d3..af3cfc1 100644 +--- a/vendor/golang.org/x/sys/unix/endian_little.go ++++ b/vendor/golang.org/x/sys/unix/endian_little.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. @@ -180,9 +196,11 @@ diff -Nuar lxcfs-tools.org/vendor/golang.org/x/sys/unix/endian_little.go lxcfs-t package unix -diff -Nuar lxcfs-tools.org/vendor/golang.org/x/sys/unix/syscall_linux_sw64.go lxcfs-tools.sw/vendor/golang.org/x/sys/unix/syscall_linux_sw64.go ---- lxcfs-tools.org/vendor/golang.org/x/sys/unix/syscall_linux_sw64.go 1970-01-01 08:00:00.000000000 +0800 -+++ lxcfs-tools.sw/vendor/golang.org/x/sys/unix/syscall_linux_sw64.go 2022-10-24 12:38:47.113502666 +0800 +diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_sw64.go b/vendor/golang.org/x/sys/unix/syscall_linux_sw64.go +new file mode 100644 +index 0000000..de81a49 +--- /dev/null ++++ b/vendor/golang.org/x/sys/unix/syscall_linux_sw64.go @@ -0,0 +1,261 @@ +// Copyright 2009 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style @@ -445,9 +463,11 @@ diff -Nuar lxcfs-tools.org/vendor/golang.org/x/sys/unix/syscall_linux_sw64.go lx +//sys utimes(path string, times *[2]Timeval) (err error) + +//sys Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error) -diff -Nuar lxcfs-tools.org/vendor/golang.org/x/sys/unix/zerrors_linux_sw64.go lxcfs-tools.sw/vendor/golang.org/x/sys/unix/zerrors_linux_sw64.go ---- lxcfs-tools.org/vendor/golang.org/x/sys/unix/zerrors_linux_sw64.go 1970-01-01 08:00:00.000000000 +0800 -+++ lxcfs-tools.sw/vendor/golang.org/x/sys/unix/zerrors_linux_sw64.go 2022-10-24 12:38:47.113502666 +0800 +diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_sw64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_sw64.go +new file mode 100644 +index 0000000..76c6c14 +--- /dev/null ++++ b/vendor/golang.org/x/sys/unix/zerrors_linux_sw64.go @@ -0,0 +1,3208 @@ +// mkerrors.sh +// Code generated by the command above; see README.md. DO NOT EDIT. @@ -3657,9 +3677,11 @@ diff -Nuar lxcfs-tools.org/vendor/golang.org/x/sys/unix/zerrors_linux_sw64.go lx + {30, "SIGUSR1", "user defined signal 1"}, + {31, "SIGUSR2", "user defined signal 2"}, +} -diff -Nuar lxcfs-tools.org/vendor/golang.org/x/sys/unix/zsyscall_linux_sw64.go lxcfs-tools.sw/vendor/golang.org/x/sys/unix/zsyscall_linux_sw64.go ---- lxcfs-tools.org/vendor/golang.org/x/sys/unix/zsyscall_linux_sw64.go 1970-01-01 08:00:00.000000000 +0800 -+++ lxcfs-tools.sw/vendor/golang.org/x/sys/unix/zsyscall_linux_sw64.go 2022-10-24 12:38:47.113502666 +0800 +diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux_sw64.go b/vendor/golang.org/x/sys/unix/zsyscall_linux_sw64.go +new file mode 100644 +index 0000000..01f5275 +--- /dev/null ++++ b/vendor/golang.org/x/sys/unix/zsyscall_linux_sw64.go @@ -0,0 +1,2649 @@ +// go run mksyscall.go -tags linux,sw64 syscall_linux.go syscall_linux_sw64.go +// Code generated by the command above; see README.md. DO NOT EDIT. @@ -6310,9 +6332,11 @@ diff -Nuar lxcfs-tools.org/vendor/golang.org/x/sys/unix/zsyscall_linux_sw64.go l +} + + -diff -Nuar lxcfs-tools.org/vendor/golang.org/x/sys/unix/zsysnum_linux_sw64.go lxcfs-tools.sw/vendor/golang.org/x/sys/unix/zsysnum_linux_sw64.go ---- lxcfs-tools.org/vendor/golang.org/x/sys/unix/zsysnum_linux_sw64.go 1970-01-01 08:00:00.000000000 +0800 -+++ lxcfs-tools.sw/vendor/golang.org/x/sys/unix/zsysnum_linux_sw64.go 2022-10-24 12:38:47.113502666 +0800 +diff --git a/vendor/golang.org/x/sys/unix/zsysnum_linux_sw64.go b/vendor/golang.org/x/sys/unix/zsysnum_linux_sw64.go +new file mode 100644 +index 0000000..519213f +--- /dev/null ++++ b/vendor/golang.org/x/sys/unix/zsysnum_linux_sw64.go @@ -0,0 +1,458 @@ +// go run linux/mksysnum.go -Wall -Werror -static -I/tmp/include /usr/include/asm/unistd.h +// Code generated by the command above; see README.md. DO NOT EDIT. @@ -6772,9 +6796,11 @@ diff -Nuar lxcfs-tools.org/vendor/golang.org/x/sys/unix/zsysnum_linux_sw64.go lx + SYS_PWRITEV2 = 517 + SYS_STATX = 518 +) -diff -Nuar lxcfs-tools.org/vendor/golang.org/x/sys/unix/ztypes_linux_sw64.go lxcfs-tools.sw/vendor/golang.org/x/sys/unix/ztypes_linux_sw64.go ---- lxcfs-tools.org/vendor/golang.org/x/sys/unix/ztypes_linux_sw64.go 1970-01-01 08:00:00.000000000 +0800 -+++ lxcfs-tools.sw/vendor/golang.org/x/sys/unix/ztypes_linux_sw64.go 2022-10-24 12:38:47.113502666 +0800 +diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux_sw64.go b/vendor/golang.org/x/sys/unix/ztypes_linux_sw64.go +new file mode 100644 +index 0000000..019ebb2 +--- /dev/null ++++ b/vendor/golang.org/x/sys/unix/ztypes_linux_sw64.go @@ -0,0 +1,3361 @@ +// cgo -godefs -- -Wall -Werror -static -I/tmp/include linux/types.go | go run mkpost.go +// Code generated by the command above; see README.md. DO NOT EDIT. @@ -10137,3 +10163,6 @@ diff -Nuar lxcfs-tools.org/vendor/golang.org/x/sys/unix/ztypes_linux_sw64.go lxc + NLMSGERR_ATTR_OFFS = 0x2 + NLMSGERR_ATTR_COOKIE = 0x3 +) +-- +2.20.1 + diff --git a/lxcfs-tools.spec b/lxcfs-tools.spec index 938e4b62fddecf12f4fe02e4f6854e9bf56c47d3..489570af345f6ffc7b9553efe0cc0dfe1009417b 100644 --- a/lxcfs-tools.spec +++ b/lxcfs-tools.spec @@ -1,7 +1,7 @@ #Basic Information Name: lxcfs-tools Version: 0.3 -Release: 35 +Release: 36 Summary: toolkit for lxcfs to remount a running isulad License: Mulan PSL v2 URL: https://gitee.com/openeuler/lxcfs-tools @@ -16,9 +16,7 @@ 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 -%ifarch sw_64 Patch1000: lxcfs-tools-sw.patch -%endif #Dependency BuildRequires: golang > 1.7 @@ -42,7 +40,9 @@ go mod vendor # add loong64 to syscall_linux_64.go file sed 's/mips64/mips64 loong64/g' -i vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_64.go %endif - +%ifarch sw_64 +sed -i 's/-buildmode=pie//g' Makefile +%endif %build make @@ -114,6 +114,12 @@ rm -rfv %{buildroot} %changelog +* Tue Mar 18 2025 mahailiang - 0.3-36 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:modify sw patch + * Tue Apr 16 2024 Pengda Dou - 0.3-35 - add support for loongarch64