From: <mingli.yu@windriver.com>
To: <meta-virtualization@lists.yoctoproject.org>
Subject: [kirkstone][PATCH] docker-distribution: Use dup3 for riscv64
Date: Wed, 10 Jul 2024 14:20:47 +0800 [thread overview]
Message-ID: <20240710062047.3128305-1-mingli.yu@windriver.com> (raw)
From: Mingli Yu <mingli.yu@windriver.com>
Use dup3 instead for riscv64 as there is no dup2 on riscv64 linux
to fix the below build failure:
vendor/github.com/bugsnag/panicwrap/dup2.go:10:9: undefined: syscall.Dup2
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
.../docker-distribution_git.bb | 1 +
...-panicwrap-Use-dup3-on-riscv64-linux.patch | 42 +++++++++++++++++++
2 files changed, 43 insertions(+)
create mode 100644 recipes-containers/docker-distribution/files/0001-panicwrap-Use-dup3-on-riscv64-linux.patch
diff --git a/recipes-containers/docker-distribution/docker-distribution_git.bb b/recipes-containers/docker-distribution/docker-distribution_git.bb
index f8981a88..50b6b302 100644
--- a/recipes-containers/docker-distribution/docker-distribution_git.bb
+++ b/recipes-containers/docker-distribution/docker-distribution_git.bb
@@ -8,6 +8,7 @@ SRC_URI = "git://github.com/docker/distribution.git;branch=release/2.8;name=dist
file://docker-registry.service \
file://0001-build-use-to-use-cross-go-compiler.patch \
file://0001-Fix-runaway-allocation-on-v2-_catalog.patch \
+ file://0001-panicwrap-Use-dup3-on-riscv64-linux.patch \
"
PACKAGES =+ "docker-registry"
diff --git a/recipes-containers/docker-distribution/files/0001-panicwrap-Use-dup3-on-riscv64-linux.patch b/recipes-containers/docker-distribution/files/0001-panicwrap-Use-dup3-on-riscv64-linux.patch
new file mode 100644
index 00000000..ad091f1c
--- /dev/null
+++ b/recipes-containers/docker-distribution/files/0001-panicwrap-Use-dup3-on-riscv64-linux.patch
@@ -0,0 +1,42 @@
+From 21d54c68751760b1f8915807794a432cf01fb733 Mon Sep 17 00:00:00 2001
+From: Mingli Yu <mingli.yu@windriver.com>
+Date: Tue, 9 Jul 2024 16:28:14 +0800
+Subject: [PATCH] panicwrap: Use dup3 on riscv64 linux
+
+Use dup3 instead for riscv64 as there is no dup2 on riscv64 linux
+to fix the below failure:
+ vendor/github.com/bugsnag/panicwrap/dup2.go:10:9: undefined: syscall.Dup2
+
+Upstream-Status: Inappropriate[The upstream has removed the panicwrap as [1]]
+
+[1] https://github.com/distribution/distribution/commit/3e4c4ead4c3aa07c27f95f2a5c92c6d5c2f9dcdb
+
+Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
+---
+ vendor/github.com/bugsnag/panicwrap/dup2.go | 2 +-
+ vendor/github.com/bugsnag/panicwrap/dup3.go | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/vendor/github.com/bugsnag/panicwrap/dup2.go b/vendor/github.com/bugsnag/panicwrap/dup2.go
+index de523c83..c68ce5ff 100644
+--- a/vendor/github.com/bugsnag/panicwrap/dup2.go
++++ b/vendor/github.com/bugsnag/panicwrap/dup2.go
+@@ -1,4 +1,4 @@
+-// +build darwin dragonfly freebsd linux,!arm64 netbsd openbsd
++// +build darwin dragonfly freebsd linux,!arm64,!riscv64 netbsd openbsd
+
+ package panicwrap
+
+diff --git a/vendor/github.com/bugsnag/panicwrap/dup3.go b/vendor/github.com/bugsnag/panicwrap/dup3.go
+index 9721b36c..c664da85 100644
+--- a/vendor/github.com/bugsnag/panicwrap/dup3.go
++++ b/vendor/github.com/bugsnag/panicwrap/dup3.go
+@@ -1,4 +1,4 @@
+-// +build linux,arm64
++// +build linux,arm64 linux,riscv64
+
+ package panicwrap
+
+--
+2.34.1
+
--
2.34.1
next reply other threads:[~2024-07-10 6:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-10 6:20 mingli.yu [this message]
2024-07-22 22:26 ` [meta-virtualization] [kirkstone][PATCH] docker-distribution: Use dup3 for riscv64 Bruce Ashfield
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240710062047.3128305-1-mingli.yu@windriver.com \
--to=mingli.yu@windriver.com \
--cc=meta-virtualization@lists.yoctoproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.