summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXiangyu Chen <xiangyu.chen@windriver.com>2023-02-10 10:18:43 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-02-15 10:21:35 +0000
commit45d30727926ba8d673df9a01687ba0f809024abf (patch)
tree873a691286daf3860536c96a8a2ac64a7f592658
parent4f1a0855afbfc886dc59cfaa79a11d0fed8eaa3e (diff)
downloadpoky-45d30727926ba8d673df9a01687ba0f809024abf.tar.gz
dhcpcd: fix dhcpcd start failure on qemuppc64
Backport patch to fix dhcpcd start failed on qemuppc64. (From OE-Core rev: a31d658198566de12cdd1aad18776b8da8065787) Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb1
-rw-r--r--meta/recipes-connectivity/dhcpcd/files/0001-privsep-linux-fix-SECCOMP_AUDIT_ARCH-missing-ppc64le.patch34
2 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb
index 5cf77fa0f6..39e689d2f6 100644
--- a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb
+++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb
@@ -16,6 +16,7 @@ SRC_URI = "https://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz \
16 file://0001-20-resolv.conf-improve-the-sitation-of-working-with-.patch \ 16 file://0001-20-resolv.conf-improve-the-sitation-of-working-with-.patch \
17 file://0001-privsep-Allow-getrandom-sysctl-for-newer-glibc.patch \ 17 file://0001-privsep-Allow-getrandom-sysctl-for-newer-glibc.patch \
18 file://0002-privsep-Allow-newfstatat-syscall-as-well.patch \ 18 file://0002-privsep-Allow-newfstatat-syscall-as-well.patch \
19 file://0001-privsep-linux-fix-SECCOMP_AUDIT_ARCH-missing-ppc64le.patch \
19 file://dhcpcd.service \ 20 file://dhcpcd.service \
20 file://dhcpcd@.service \ 21 file://dhcpcd@.service \
21 " 22 "
diff --git a/meta/recipes-connectivity/dhcpcd/files/0001-privsep-linux-fix-SECCOMP_AUDIT_ARCH-missing-ppc64le.patch b/meta/recipes-connectivity/dhcpcd/files/0001-privsep-linux-fix-SECCOMP_AUDIT_ARCH-missing-ppc64le.patch
new file mode 100644
index 0000000000..1c514f9b8c
--- /dev/null
+++ b/meta/recipes-connectivity/dhcpcd/files/0001-privsep-linux-fix-SECCOMP_AUDIT_ARCH-missing-ppc64le.patch
@@ -0,0 +1,34 @@
1From 7a2d9767585ed2c407d4985bd2d81552034fb90a Mon Sep 17 00:00:00 2001
2From: CHEN Xiangyu <xiangyu.chen@aol.com>
3Date: Thu, 9 Feb 2023 18:41:52 +0800
4Subject: [PATCH] privsep-linux: fix SECCOMP_AUDIT_ARCH missing ppc64le (#181)
5
6when dhcpcd running on ppc64le platform, it would be killed by SIGSYS.
7
8Upstream-Status: Backport [7a2d9767585ed2c407d4985bd2d81552034fb90a]
9
10Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com>
11---
12 src/privsep-linux.c | 6 +++++-
13 1 file changed, 5 insertions(+), 1 deletion(-)
14
15diff --git a/src/privsep-linux.c b/src/privsep-linux.c
16index 7372d26b..6a301950 100644
17--- a/src/privsep-linux.c
18+++ b/src/privsep-linux.c
19@@ -232,7 +232,11 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg)
20 #elif defined(__or1k__)
21 # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_OPENRISC
22 #elif defined(__powerpc64__)
23-# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64
24+# if (BYTE_ORDER == LITTLE_ENDIAN)
25+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64LE
26+# else
27+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64
28+# endif
29 #elif defined(__powerpc__)
30 # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC
31 #elif defined(__riscv)
32--
332.34.1
34