diff options
author | Yi Zhao <yi.zhao@windriver.com> | 2020-12-09 16:12:29 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-12-15 22:51:55 +0000 |
commit | 98a0b83eb105da7d933fef738381e44e23dbc059 (patch) | |
tree | b2dfc10d689468f3963c2c214bc9a76c05b110df /meta | |
parent | 4864764667097b32a3ee1935e2c52df732d55632 (diff) | |
download | poky-98a0b83eb105da7d933fef738381e44e23dbc059.tar.gz |
dhcpcd: upgrade 9.3.2 -> 9.3.4
Backport a patch to fix privsep build error on ppc.
(From OE-Core rev: d79624f9dbe79f6185a2d6127c67508ba940f527)
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-connectivity/dhcpcd/dhcpcd_9.3.4.bb (renamed from meta/recipes-connectivity/dhcpcd/dhcpcd_9.3.2.bb) | 3 | ||||
-rw-r--r-- | meta/recipes-connectivity/dhcpcd/files/0001-Linux-Fix-privsep-build-by-including-sys-termios.h-f.patch | 29 |
2 files changed, 31 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.3.2.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.3.4.bb index cca60ddae2..cd81f17773 100644 --- a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.3.2.bb +++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.3.4.bb | |||
@@ -13,11 +13,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://0001-Linux-Fix-privsep-build-by-including-sys-termios.h-f.patch \ | ||
16 | file://dhcpcd.service \ | 17 | file://dhcpcd.service \ |
17 | file://dhcpcd@.service \ | 18 | file://dhcpcd@.service \ |
18 | " | 19 | " |
19 | 20 | ||
20 | SRC_URI[sha256sum] = "6d49af5e766a2515e6366e4f669663df04ecdf90a1a60ddb1d7a2feb4b5d2566" | 21 | SRC_URI[sha256sum] = "5c823a0b981b52e7e0fd3183ae220422d6fcc3aa511af31dcb1a7ee6cb0f1c39" |
21 | 22 | ||
22 | inherit pkgconfig autotools-brokensep systemd useradd | 23 | inherit pkgconfig autotools-brokensep systemd useradd |
23 | 24 | ||
diff --git a/meta/recipes-connectivity/dhcpcd/files/0001-Linux-Fix-privsep-build-by-including-sys-termios.h-f.patch b/meta/recipes-connectivity/dhcpcd/files/0001-Linux-Fix-privsep-build-by-including-sys-termios.h-f.patch new file mode 100644 index 0000000000..095e3eb409 --- /dev/null +++ b/meta/recipes-connectivity/dhcpcd/files/0001-Linux-Fix-privsep-build-by-including-sys-termios.h-f.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From e7c22336461ee345a5668eed6158e935cd4cdf1a Mon Sep 17 00:00:00 2001 | ||
2 | From: Mikhail Efremov <sem@altlinux.org> | ||
3 | Date: Tue, 8 Dec 2020 16:15:28 +0000 | ||
4 | Subject: [PATCH] Linux: Fix privsep build by including sys/termios.h for all | ||
5 | platforms | ||
6 | |||
7 | Upstream-Status: Backport | ||
8 | [https://roy.marples.name/cgit/dhcpcd.git/commit/?id=e7c22336461ee345a5668eed6158e935cd4cdf1a] | ||
9 | |||
10 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
11 | --- | ||
12 | src/privsep-linux.c | 1 + | ||
13 | 1 file changed, 1 insertion(+) | ||
14 | |||
15 | diff --git a/src/privsep-linux.c b/src/privsep-linux.c | ||
16 | index e588ecd7..1fbe97fa 100644 | ||
17 | --- a/src/privsep-linux.c | ||
18 | +++ b/src/privsep-linux.c | ||
19 | @@ -29,6 +29,7 @@ | ||
20 | #include <sys/ioctl.h> | ||
21 | #include <sys/prctl.h> | ||
22 | #include <sys/syscall.h> | ||
23 | +#include <sys/termios.h> /* For TCGETS */ | ||
24 | |||
25 | #include <linux/audit.h> | ||
26 | #include <linux/filter.h> | ||
27 | -- | ||
28 | 2.25.1 | ||
29 | |||