diff options
author | wangmy <wangmy@fujitsu.com> | 2021-10-25 22:26:52 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-27 09:46:41 +0100 |
commit | bd468de87be18d654b43ae68300d586ce8508a9c (patch) | |
tree | 0ff866dca62df1825fdf4a8b9b14c7f9cbd1cd3d /meta/recipes-connectivity | |
parent | 71d1f23204816c78ed43d071ae8856c950dac94d (diff) | |
download | poky-bd468de87be18d654b43ae68300d586ce8508a9c.tar.gz |
dhcpcd: upgrade 9.4.0 -> 9.4.1
0002-src-privsep-linux.c-add-support-for-arc-28.patch
removed since it is included in 9.4.1
-License-Update: Copyright year updated to 2021.
(From OE-Core rev: 85bf75384a60e3db5458153e46dcdeb756d05b47)
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r-- | meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb (renamed from meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.0.bb) | 5 | ||||
-rw-r--r-- | meta/recipes-connectivity/dhcpcd/files/0002-src-privsep-linux.c-add-support-for-arc-28.patch | 63 |
2 files changed, 2 insertions, 66 deletions
diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.0.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb index dbad8c8728..4007a4bd2d 100644 --- a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.0.bb +++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb | |||
@@ -7,18 +7,17 @@ DESCRIPTION = "dhcpcd runs on your machine and silently configures your \ | |||
7 | HOMEPAGE = "http://roy.marples.name/projects/dhcpcd/" | 7 | HOMEPAGE = "http://roy.marples.name/projects/dhcpcd/" |
8 | 8 | ||
9 | LICENSE = "BSD-2-Clause" | 9 | LICENSE = "BSD-2-Clause" |
10 | LIC_FILES_CHKSUM = "file://LICENSE;md5=9674cc803c5d71306941e6e8b5c002f2" | 10 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d148485768fe85b9f1072b186a7e9b4d" |
11 | 11 | ||
12 | UPSTREAM_CHECK_URI = "https://roy.marples.name/downloads/dhcpcd/" | 12 | UPSTREAM_CHECK_URI = "https://roy.marples.name/downloads/dhcpcd/" |
13 | 13 | ||
14 | SRC_URI = "https://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz \ | 14 | SRC_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 \ | ||
17 | file://dhcpcd.service \ | 16 | file://dhcpcd.service \ |
18 | file://dhcpcd@.service \ | 17 | file://dhcpcd@.service \ |
19 | " | 18 | " |
20 | 19 | ||
21 | SRC_URI[sha256sum] = "41a69297f380bf15ee8f94f73154f8c2bca7157a087c0d5aca8de000ba1d4513" | 20 | SRC_URI[sha256sum] = "819357634efed1ea5cf44ec01b24d3d3f8852fec8b4249925dcc5667c54e376c" |
22 | 21 | ||
23 | inherit pkgconfig autotools-brokensep systemd useradd | 22 | inherit pkgconfig autotools-brokensep systemd useradd |
24 | 23 | ||
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 deleted file mode 100644 index 045f06a9aa..0000000000 --- a/meta/recipes-connectivity/dhcpcd/files/0002-src-privsep-linux.c-add-support-for-arc-28.patch +++ /dev/null | |||
@@ -1,63 +0,0 @@ | |||
1 | From 82386110e67cf75c224e9817fce55e6b0f143266 Mon Sep 17 00:00:00 2001 | ||
2 | From: Fabrice Fontaine <fontaine.fabrice@gmail.com> | ||
3 | Date: Mon, 8 Feb 2021 07:23:54 +0100 | ||
4 | Subject: [PATCH] src/privsep-linux.c: add support for arc (#28) | ||
5 | |||
6 | Fix the following build failure: | ||
7 | |||
8 | privsep-linux.c:206:4: error: #error "Platform does not support seccomp filter yet" | ||
9 | # error "Platform does not support seccomp filter yet" | ||
10 | ^~~~~ | ||
11 | In file included from privsep-linux.c:36: | ||
12 | privsep-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 | |||
16 | It should be noted that AUDIT_ARCH_{ARCOMPACT,ARCV2} is only defined | ||
17 | since kernel 5.2 and | ||
18 | https://github.com/torvalds/linux/commit/67f2a8a29311841ba6ab9b0e2d1b8f1e9978cd84 | ||
19 | |||
20 | Detection of arc compact and arc v2 have been "copy/pasted" from | ||
21 | https://github.com/wbx-github/uclibc-ng/commit/afab56958f1cbb47b831ee3ebff231dfbae74af2 | ||
22 | |||
23 | Fixes: | ||
24 | - http://autobuild.buildroot.org/results/d29083700a80dd647621eed06faeeae03f0587d3 | ||
25 | |||
26 | Upstream-Status: Backport [https://github.com/NetworkConfiguration/dhcpcd/commit/82386110e67cf75c224e9817fce55e6b0f143266] | ||
27 | |||
28 | Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> | ||
29 | Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com> | ||
30 | --- | ||
31 | src/privsep-linux.c | 16 ++++++++++++++++ | ||
32 | 1 file changed, 16 insertions(+) | ||
33 | |||
34 | diff --git a/src/privsep-linux.c b/src/privsep-linux.c | ||
35 | index 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 | -- | ||
62 | 2.16.2 | ||
63 | |||