summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Brodkin <Alexey.Brodkin@synopsys.com>2021-07-04 13:02:02 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-05 10:59:40 +0100
commitbdf408ca92b1430cf265171d5be85f76bc6d4ece (patch)
treecf915aa9b0e2f2ced3cbb3bc49d9e2525a7b06b6
parent768d6210677953cea4e1db5a5fc6be4c6598f36a (diff)
downloadpoky-bdf408ca92b1430cf265171d5be85f76bc6d4ece.tar.gz
dhcpcd: add ARC support
This retrofits ARC support from upstream [1]. Should be a part of the next release of "dhcpcd". https://github.com/NetworkConfiguration/dhcpcd/commit/82386110e67cf75c224e9817fce55e6b0f143266 (From OE-Core rev: 5f4f9529b89b7e3357f6b979bb7d97c4c937d44c) Signed-off-by: Alexey Brodkin <abrodkin@synopsys.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.0.bb1
-rw-r--r--meta/recipes-connectivity/dhcpcd/files/0002-src-privsep-linux.c-add-support-for-arc-28.patch63
2 files changed, 64 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.0.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.0.bb
index 56fcf5cc0b..5be480eb03 100644
--- a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.0.bb
+++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.0.bb
@@ -13,6 +13,7 @@ UPSTREAM_CHECK_URI = "https://roy.marples.name/downloads/dhcpcd/"
13 13
14SRC_URI = "https://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz \ 14SRC_URI = "https://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz \
15 file://0001-remove-INCLUDEDIR-to-prevent-build-issues.patch \ 15 file://0001-remove-INCLUDEDIR-to-prevent-build-issues.patch \
16 file://0002-src-privsep-linux.c-add-support-for-arc-28.patch \
16 file://dhcpcd.service \ 17 file://dhcpcd.service \
17 file://dhcpcd@.service \ 18 file://dhcpcd@.service \
18 " 19 "
diff --git a/meta/recipes-connectivity/dhcpcd/files/0002-src-privsep-linux.c-add-support-for-arc-28.patch b/meta/recipes-connectivity/dhcpcd/files/0002-src-privsep-linux.c-add-support-for-arc-28.patch
new file mode 100644
index 0000000000..045f06a9aa
--- /dev/null
+++ b/meta/recipes-connectivity/dhcpcd/files/0002-src-privsep-linux.c-add-support-for-arc-28.patch
@@ -0,0 +1,63 @@
1From 82386110e67cf75c224e9817fce55e6b0f143266 Mon Sep 17 00:00:00 2001
2From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
3Date: Mon, 8 Feb 2021 07:23:54 +0100
4Subject: [PATCH] src/privsep-linux.c: add support for arc (#28)
5
6Fix the following build failure:
7
8privsep-linux.c:206:4: error: #error "Platform does not support seccomp filter yet"
9 # error "Platform does not support seccomp filter yet"
10 ^~~~~
11In file included from privsep-linux.c:36:
12privsep-linux.c:213:38: error: 'SECCOMP_AUDIT_ARCH' undeclared here (not in a function); did you mean 'SECCOMP_ALLOW_ARG'?
13 BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, SECCOMP_AUDIT_ARCH, 1, 0),
14 ^~~~~~~~~~~~~~~~~~
15
16It should be noted that AUDIT_ARCH_{ARCOMPACT,ARCV2} is only defined
17since kernel 5.2 and
18https://github.com/torvalds/linux/commit/67f2a8a29311841ba6ab9b0e2d1b8f1e9978cd84
19
20Detection of arc compact and arc v2 have been "copy/pasted" from
21https://github.com/wbx-github/uclibc-ng/commit/afab56958f1cbb47b831ee3ebff231dfbae74af2
22
23Fixes:
24 - http://autobuild.buildroot.org/results/d29083700a80dd647621eed06faeeae03f0587d3
25
26Upstream-Status: Backport [https://github.com/NetworkConfiguration/dhcpcd/commit/82386110e67cf75c224e9817fce55e6b0f143266]
27
28Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
29Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
30---
31 src/privsep-linux.c | 16 ++++++++++++++++
32 1 file changed, 16 insertions(+)
33
34diff --git a/src/privsep-linux.c b/src/privsep-linux.c
35index 402667af..21d41a9a 100644
36--- a/src/privsep-linux.c
37+++ b/src/privsep-linux.c
38@@ -149,6 +149,22 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg)
39 # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_I386
40 #elif defined(__x86_64__)
41 # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_X86_64
42+#elif defined(__arc__)
43+# if defined(__A7__)
44+# if (BYTE_ORDER == LITTLE_ENDIAN)
45+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_ARCOMPACT
46+# else
47+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_ARCOMPACTBE
48+# endif
49+# elif defined(__HS__)
50+# if (BYTE_ORDER == LITTLE_ENDIAN)
51+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_ARCV2
52+# else
53+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_ARCV2BE
54+# endif
55+# else
56+# error "Platform does not support seccomp filter yet"
57+# endif
58 #elif defined(__arm__)
59 # ifndef EM_ARM
60 # define EM_ARM 40
61--
622.16.2
63