From a339f576faa3e54c25476c1bdb76a51c15575d80 Mon Sep 17 00:00:00 2001 From: Dingli Zhang Date: Mon, 9 Jun 2025 13:04:25 +0000 Subject: [PATCH] seccomp: add riscv64 mapping to seccomp_linux.go (cherry picked from commit 9cc504c73a6f1534ebd375e7c7cda27bba87b047) --- ...-riscv64-mapping-to-seccomp_linux.go.patch | 29 +++++++++++++++++++ moby.spec | 6 +++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 1020-seccomp-add-riscv64-mapping-to-seccomp_linux.go.patch diff --git a/1020-seccomp-add-riscv64-mapping-to-seccomp_linux.go.patch b/1020-seccomp-add-riscv64-mapping-to-seccomp_linux.go.patch new file mode 100644 index 0000000..09cb663 --- /dev/null +++ b/1020-seccomp-add-riscv64-mapping-to-seccomp_linux.go.patch @@ -0,0 +1,29 @@ +From a80a8b9254140be59fe7a547cd81630754959f3f Mon Sep 17 00:00:00 2001 +From: Dingli Zhang +Date: Tue, 10 Jun 2025 02:19:37 +0000 +Subject: [PATCH] seccomp: add riscv64 mapping to seccomp_linux.go + + +diff --git a/profiles/seccomp/seccomp_linux.go b/profiles/seccomp/seccomp_linux.go +index 9eb0741..1b08dd8 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, + "loong64": specs.ArchLOONGARCH64, +@@ -58,6 +59,7 @@ var goToNative = map[string]string{ + "ppc": "ppc", + "ppc64": "ppc64", + "ppc64le": "ppc64le", ++ "riscv64": "riscv64", + "s390": "s390", + "s390x": "s390x", + "loong64": "loong64", +-- +2.43.0 + diff --git a/moby.spec b/moby.spec index b2926d3..c255e77 100644 --- a/moby.spec +++ b/moby.spec @@ -7,7 +7,7 @@ Name: moby Version: 25.0.3 -Release: 31 +Release: 32 Summary: The open-source application container engine License: Apache-2.0 URL: https://www.docker.com @@ -43,6 +43,7 @@ Patch1016: 1016-Fix-cases-where-we-are-wrapping-a-nil-error.patch Patch1017: 1017-libnetwork-fix-non-constant-format-string-in-call-go.patch Patch1018: 1018-Fix-setup-user-chains-even-if-there-are-running-cont.patch Patch1019: 1019-Dockerd-rootless-make-etc-var-run-cdi-available.patch +Patch1020: 1020-seccomp-add-riscv64-mapping-to-seccomp_linux.go.patch # Patch 2001-2999 for tini Patch2001: 2001-tini.c-a-function-declaration-without-a-prototype-is.patch Requires(meta): %{name}-engine = %{version}-%{release} @@ -234,6 +235,9 @@ fi %systemd_postun_with_restart docker.service %changelog +* Mon Jun 9 2025 Dingli Zhang - 25.0.3-32 +- seccomp: add riscv64 mapping to seccomp_linux.go + * Mon Apr 21 2025 shechenglong - 25.0.3-31 - Dockerd rootless: make {/etc,/var/run}/cdi available -- Gitee