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

patch hunk FAILED bacause of the arch judgement of sw_64 and loongarch64

Browse Source 
(cherry picked from commit 32b251b9faa3c72e8839eda9559993ab88dfa851)
This commit is contained in:
zhangxianting 2024-03-11 17:44:32 +08:00 committed by openeuler-sync-bot
parent ca55005f18
commit 4dc60fee28
2 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
1001-add-loongarch64-support-not-upstream-modified-files.patch
View File

@ -537,84 +537,84 @@ Signed-off-by: Jingyun Hua <huajingyun@loongson.cn>
create mode 100644 vendor/golang.org/x/sys/windows/syscall_windows_test.go create mode 100644 vendor/golang.org/x/sys/windows/syscall_windows_test.go
diff --git a/vendor/github.com/opencontainers/runc/libcontainer/seccomp/config.go b/vendor/github.com/opencontainers/runc/libcontainer/seccomp/config.go diff --git a/vendor/github.com/opencontainers/runc/libcontainer/seccomp/config.go b/vendor/github.com/opencontainers/runc/libcontainer/seccomp/config.go
index 7a0b74c..ed51d2a 100644 index ded5a6b..e6218a0 100644
--- a/vendor/github.com/opencontainers/runc/libcontainer/seccomp/config.go --- a/vendor/github.com/opencontainers/runc/libcontainer/seccomp/config.go
+++ b/vendor/github.com/opencontainers/runc/libcontainer/seccomp/config.go +++ b/vendor/github.com/opencontainers/runc/libcontainer/seccomp/config.go
@@ -31,6 +31,7 @@ var archs = map[string]string{ @@ -30,6 +30,7 @@ var archs = map[string]string{
"SCMP_ARCH_X32": "x32",
"SCMP_ARCH_ARM": "arm", "SCMP_ARCH_ARM": "arm",
"SCMP_ARCH_AARCH64": "arm64", "SCMP_ARCH_AARCH64": "arm64",
"SCMP_ARCH_SW64": "sw64",
+ "SCMP_ARCH_LOONG64": "loong64", + "SCMP_ARCH_LOONG64": "loong64",
"SCMP_ARCH_MIPS": "mips", "SCMP_ARCH_MIPS": "mips",
"SCMP_ARCH_MIPS64": "mips64", "SCMP_ARCH_MIPS64": "mips64",
"SCMP_ARCH_MIPS64N32": "mips64n32", "SCMP_ARCH_MIPS64N32": "mips64n32",
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 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 cea2a9b..7c429cb 100644 index 6e89196..77d011b 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 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,sw64 linux,loong64 +// +build linux,arm64 linux,amd64 linux,ppc linux,ppc64 linux,ppc64le linux,s390x linux,riscv64 linux,loong64
package system package system
diff --git a/vendor/github.com/opencontainers/runtime-spec/specs-go/config.go b/vendor/github.com/opencontainers/runtime-spec/specs-go/config.go 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 4718358..63dc00d 100644 index bd8e96a..8376089 100644
--- a/vendor/github.com/opencontainers/runtime-spec/specs-go/config.go --- a/vendor/github.com/opencontainers/runtime-spec/specs-go/config.go
+++ b/vendor/github.com/opencontainers/runtime-spec/specs-go/config.go +++ b/vendor/github.com/opencontainers/runtime-spec/specs-go/config.go
@@ -496,6 +496,7 @@ const ( @@ -495,6 +495,7 @@ const (
ArchX32 Arch = "SCMP_ARCH_X32"
ArchARM Arch = "SCMP_ARCH_ARM" ArchARM Arch = "SCMP_ARCH_ARM"
ArchAARCH64 Arch = "SCMP_ARCH_AARCH64" ArchAARCH64 Arch = "SCMP_ARCH_AARCH64"
ArchiSW64 Arch = "SCMP_ARCH_SW64"
+ ArchLOONG64 Arch = "SCMP_ARCH_LOONG64" + ArchLOONG64 Arch = "SCMP_ARCH_LOONG64"
ArchMIPS Arch = "SCMP_ARCH_MIPS" ArchMIPS Arch = "SCMP_ARCH_MIPS"
ArchMIPS64 Arch = "SCMP_ARCH_MIPS64" ArchMIPS64 Arch = "SCMP_ARCH_MIPS64"
ArchMIPS64N32 Arch = "SCMP_ARCH_MIPS64N32" ArchMIPS64N32 Arch = "SCMP_ARCH_MIPS64N32"
diff --git a/vendor/github.com/seccomp/libseccomp-golang/seccomp.go b/vendor/github.com/seccomp/libseccomp-golang/seccomp.go diff --git a/vendor/github.com/seccomp/libseccomp-golang/seccomp.go b/vendor/github.com/seccomp/libseccomp-golang/seccomp.go
index df5ad54..8717fd2 100644 index a3cc538..da5cf73 100644
--- a/vendor/github.com/seccomp/libseccomp-golang/seccomp.go --- a/vendor/github.com/seccomp/libseccomp-golang/seccomp.go
+++ b/vendor/github.com/seccomp/libseccomp-golang/seccomp.go +++ b/vendor/github.com/seccomp/libseccomp-golang/seccomp.go
@@ -97,6 +97,8 @@ const ( @@ -95,6 +95,8 @@ const (
// ArchSW64 represents 64-bit SW64 syscalls // ArchARM64 represents 64-bit ARM syscalls
ArchSW64 ScmpArch = iota ArchARM64 ScmpArch = iota
// ArchMIPS represents 32-bit MIPS syscalls // ArchMIPS represents 32-bit MIPS syscalls
+ // ArchLOONG64 represents 64-bit LOONG64 syscalls + // ArchLOONG64 represents 64-bit LOONG64 syscalls
+ ArchLOONG64 ScmpArch = iota + ArchLOONG64 ScmpArch = iota
ArchMIPS ScmpArch = iota ArchMIPS ScmpArch = iota
// ArchMIPS64 represents 64-bit MIPS syscalls // ArchMIPS64 represents 64-bit MIPS syscalls
ArchMIPS64 ScmpArch = iota ArchMIPS64 ScmpArch = iota
@@ -196,6 +198,8 @@ func GetArchFromString(arch string) (ScmpArch, error) { @@ -192,6 +194,8 @@ func GetArchFromString(arch string) (ScmpArch, error) {
return ArchARM, nil
case "arm64", "aarch64":
return ArchARM64, nil return ArchARM64, nil
case "sw64", "sw64":
return ArchSW64, nil
+ case "loong64": + case "loong64":
+ return ArchLOONG64, nil + return ArchLOONG64, nil
case "mips": case "mips":
return ArchMIPS, nil return ArchMIPS, nil
case "mips64": case "mips64":
@@ -238,6 +242,8 @@ func (a ScmpArch) String() string { @@ -232,6 +236,8 @@ func (a ScmpArch) String() string {
return "arm"
case ArchARM64:
return "arm64" return "arm64"
case ArchSW64:
return "sw64"
+ case ArchLOONG64: + case ArchLOONG64:
+ return "loong64" + return "loong64"
case ArchMIPS: case ArchMIPS:
return "mips" return "mips"
case ArchMIPS64: case ArchMIPS64:
diff --git a/vendor/github.com/seccomp/libseccomp-golang/seccomp_internal.go b/vendor/github.com/seccomp/libseccomp-golang/seccomp_internal.go diff --git a/vendor/github.com/seccomp/libseccomp-golang/seccomp_internal.go b/vendor/github.com/seccomp/libseccomp-golang/seccomp_internal.go
index 9e5fa0d..3ffaa46 100644 index 4e36b27..e250869 100644
--- a/vendor/github.com/seccomp/libseccomp-golang/seccomp_internal.go --- a/vendor/github.com/seccomp/libseccomp-golang/seccomp_internal.go
+++ b/vendor/github.com/seccomp/libseccomp-golang/seccomp_internal.go +++ b/vendor/github.com/seccomp/libseccomp-golang/seccomp_internal.go
@@ -57,6 +57,7 @@ const uint32_t C_ARCH_X32 = SCMP_ARCH_X32; @@ -56,6 +56,7 @@ 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; const uint32_t C_ARCH_ARM = SCMP_ARCH_ARM;
const uint32_t C_ARCH_AARCH64 = SCMP_ARCH_AARCH64; const uint32_t C_ARCH_AARCH64 = SCMP_ARCH_AARCH64;
const uint32_t C_ARCH_SW64 = SCMP_ARCH_SW64;
+const uint32_t C_ARCH_LOONG64 = SCMP_ARCH_LOONG64; +const uint32_t C_ARCH_LOONG64 = SCMP_ARCH_LOONG64;
const uint32_t C_ARCH_MIPS = SCMP_ARCH_MIPS; const uint32_t C_ARCH_MIPS = SCMP_ARCH_MIPS;
const uint32_t C_ARCH_MIPS64 = SCMP_ARCH_MIPS64; const uint32_t C_ARCH_MIPS64 = SCMP_ARCH_MIPS64;
const uint32_t C_ARCH_MIPS64N32 = SCMP_ARCH_MIPS64N32; const uint32_t C_ARCH_MIPS64N32 = SCMP_ARCH_MIPS64N32;
@@ -427,6 +428,8 @@ func archFromNative(a C.uint32_t) (ScmpArch, error) { @@ -421,6 +422,8 @@ func archFromNative(a C.uint32_t) (ScmpArch, error) {
return ArchSW64, nil return ArchNative, nil
case C.C_ARCH_AARCH64: case C.C_ARCH_AARCH64:
return ArchARM64, nil return ArchARM64, nil
+ case C.C_ARCH_LOONG64: + case C.C_ARCH_LOONG64:
@ -622,8 +622,8 @@ index 9e5fa0d..3ffaa46 100644
case C.C_ARCH_MIPS: case C.C_ARCH_MIPS:
return ArchMIPS, nil return ArchMIPS, nil
case C.C_ARCH_MIPS64: case C.C_ARCH_MIPS64:
@@ -469,6 +472,8 @@ func (a ScmpArch) toNative() C.uint32_t { @@ -461,6 +464,8 @@ func (a ScmpArch) toNative() C.uint32_t {
return C.C_ARCH_SW64 return C.C_ARCH_ARM
case ArchARM64: case ArchARM64:
return C.C_ARCH_AARCH64 return C.C_ARCH_AARCH64
+ case ArchLOONG64: + case ArchLOONG64:
@ -6137,15 +6137,15 @@ index 0000000..48eb257
+ } + }
+} +}
diff --git a/vendor/golang.org/x/sys/unix/endian_little.go b/vendor/golang.org/x/sys/unix/endian_little.go diff --git a/vendor/golang.org/x/sys/unix/endian_little.go b/vendor/golang.org/x/sys/unix/endian_little.go
index af3cfc1..529c407 100644 index bcdb5d3..bb044b8 100644
--- a/vendor/golang.org/x/sys/unix/endian_little.go --- a/vendor/golang.org/x/sys/unix/endian_little.go
+++ b/vendor/golang.org/x/sys/unix/endian_little.go +++ b/vendor/golang.org/x/sys/unix/endian_little.go
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file. // license that can be found in the LICENSE file.
// //
-// +build 386 amd64 amd64p32 arm arm64 ppc64le mipsle mips64le riscv64 sw64 -// +build 386 amd64 amd64p32 arm arm64 ppc64le mipsle mips64le riscv64
+// +build 386 amd64 amd64p32 arm arm64 ppc64le mipsle mips64le riscv64 sw64 loong64 +// +build 386 amd64 amd64p32 arm arm64 ppc64le mipsle mips64le riscv64 loong64
package unix package unix

8
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: 63 Release: 64
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
@ -126,6 +126,12 @@ chmod 0640 ${HOOK_SPEC}/hookspec.json
rm -rfv %{buildroot} rm -rfv %{buildroot}
%changelog %changelog
* Mon Mar 11 2024 zhangxianting <zhangxianting@uniontech.com> - 0.9-64
- Type:patch
- CVE:NA
- SUG:NA
- DESC:patch hunk FAILED bacause of the arch judgement of sw_64 and loongarch64
* Mon Dec 25 2023 yangjiaqi <yangjiaqi16@huawei.com> - 0.9-63 * Mon Dec 25 2023 yangjiaqi <yangjiaqi16@huawei.com> - 0.9-63
- Type:bugfix - Type:bugfix
- CVE:NA - CVE:NA