summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2020-12-09 16:12:29 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-12-10 13:40:07 +0000
commit7782d4650a3b463b271af37fc0b5e363697696df (patch)
tree4f6a127316b5464d525afcebbc7a895f21b75424
parent99ab08487fed2ad2c23d1a6b9272d24ebc6aed1e (diff)
downloadopenembedded-core-contrib-7782d4650a3b463b271af37fc0b5e363697696df.tar.gz
openembedded-core-contrib-7782d4650a3b463b271af37fc0b5e363697696df.tar.bz2
openembedded-core-contrib-7782d4650a3b463b271af37fc0b5e363697696df.zip
dhcpcd: upgrade 9.3.2 -> 9.3.4
Backport a patch to fix privsep build error on ppc. Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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.patch29
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/"
SRC_URI = "https://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz \
file://0001-remove-INCLUDEDIR-to-prevent-build-issues.patch \
+ file://0001-Linux-Fix-privsep-build-by-including-sys-termios.h-f.patch \
file://dhcpcd.service \
file://dhcpcd@.service \
"
-SRC_URI[sha256sum] = "6d49af5e766a2515e6366e4f669663df04ecdf90a1a60ddb1d7a2feb4b5d2566"
+SRC_URI[sha256sum] = "5c823a0b981b52e7e0fd3183ae220422d6fcc3aa511af31dcb1a7ee6cb0f1c39"
inherit pkgconfig autotools-brokensep systemd useradd
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 @@
+From e7c22336461ee345a5668eed6158e935cd4cdf1a Mon Sep 17 00:00:00 2001
+From: Mikhail Efremov <sem@altlinux.org>
+Date: Tue, 8 Dec 2020 16:15:28 +0000
+Subject: [PATCH] Linux: Fix privsep build by including sys/termios.h for all
+ platforms
+
+Upstream-Status: Backport
+[https://roy.marples.name/cgit/dhcpcd.git/commit/?id=e7c22336461ee345a5668eed6158e935cd4cdf1a]
+
+Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
+---
+ src/privsep-linux.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/privsep-linux.c b/src/privsep-linux.c
+index e588ecd7..1fbe97fa 100644
+--- a/src/privsep-linux.c
++++ b/src/privsep-linux.c
+@@ -29,6 +29,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/prctl.h>
+ #include <sys/syscall.h>
++#include <sys/termios.h> /* For TCGETS */
+
+ #include <linux/audit.h>
+ #include <linux/filter.h>
+--
+2.25.1
+