From d79624f9dbe79f6185a2d6127c67508ba940f527 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Wed, 9 Dec 2020 16:12:29 +0800 Subject: [PATCH] dhcpcd: upgrade 9.3.2 -> 9.3.4 Backport a patch to fix privsep build error on ppc. Signed-off-by: Yi Zhao Signed-off-by: Richard Purdie --- .../{dhcpcd_9.3.2.bb => dhcpcd_9.3.4.bb} | 3 +- ...p-build-by-including-sys-termios.h-f.patch | 29 +++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) rename meta/recipes-connectivity/dhcpcd/{dhcpcd_9.3.2.bb => dhcpcd_9.3.4.bb} (91%) create mode 100644 meta/recipes-connectivity/dhcpcd/files/0001-Linux-Fix-privsep-build-by-including-sys-termios.h-f.patch diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.3.2.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.3.4.bb similarity index 91% rename from meta/recipes-connectivity/dhcpcd/dhcpcd_9.3.2.bb rename to 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 +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 +--- + 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 + #include + #include ++#include /* For TCGETS */ + + #include + #include +-- +2.25.1 + -- 2.40.1