Skip to content

Commit

Permalink
Backport moby/moby#48455 for riscv64 seccomp
Browse files Browse the repository at this point in the history
  • Loading branch information
tianon committed Sep 9, 2024
1 parent 384388d commit 2ec3eaa
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 0 deletions.
1 change: 1 addition & 0 deletions moby-engine/debian/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ moby-engine (23.0.12-1) UNRELEASED; urgency=medium
* Update to 23.0.12
* Disable recursive cloning of submodules given a Git URL
* Update mips64le.patch with Forwarded URL
* Backport https://github.com/moby/moby/pull/48455 for riscv64 seccomp

-- Tianon Gravi <[email protected]> Thu, 30 May 2024 16:02:51 -0700

Expand Down
24 changes: 24 additions & 0 deletions moby-engine/debian/patches/48455-fix-riscv64-seccomp.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
Subject: seccomp: add riscv64 mapping to seccomp_linux.go
Author: George Adams <[email protected]>
Forwarded: https://github.com/moby/moby/pull/48455

diff --git a/profiles/seccomp/seccomp_linux.go b/profiles/seccomp/seccomp_linux.go
index 4d8fed68c6a19..17ee350e274ae 100644
--- a/profiles/seccomp/seccomp_linux.go
+++ b/profiles/seccomp/seccomp_linux.go
@@ -39,6 +39,7 @@ var nativeToSeccomp = map[string]specs.Arch{
"ppc": specs.ArchPPC,
"ppc64": specs.ArchPPC64,
"ppc64le": specs.ArchPPC64LE,
+ "riscv64": specs.ArchRISCV64,
"s390": specs.ArchS390,
"s390x": specs.ArchS390X,
}
@@ -57,6 +58,7 @@ var goToNative = map[string]string{
"ppc": "ppc",
"ppc64": "ppc64",
"ppc64le": "ppc64le",
+ "riscv64": "riscv64",
"s390": "s390",
"s390x": "s390x",
}
1 change: 1 addition & 0 deletions moby-engine/debian/patches/series
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
48455-fix-riscv64-seccomp.patch
buildkit-noclip.patch
containerd-arm64-v8.patch
git-no-submodules.patch
Expand Down

0 comments on commit 2ec3eaa

Please sign in to comment.