From 638f787f746e195d011dfb70f6a6ac557b80e110 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Mon, 10 Aug 2020 08:46:33 +0200 Subject: dlt-daemon: fix build with upstream-proposed patch for MUSL libc Signed-off-by: Gianfranco Costamagna Signed-off-by: Gianfranco Costamagna Signed-off-by: Khem Raj (cherry picked from commit a7c9aa13dd94712ea49f535fbbf38d2db54cf7e2) Signed-off-by: Scott Murray Signed-off-by: Armin Kuster --- .../dlt-daemon/dlt-daemon/241.patch | 30 ++++++++++++++++++++++ .../dlt-daemon/dlt-daemon_2.18.5.bb | 1 + 2 files changed, 31 insertions(+) create mode 100644 meta-oe/recipes-extended/dlt-daemon/dlt-daemon/241.patch diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/241.patch b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/241.patch new file mode 100644 index 0000000000..7d8f22ec78 --- /dev/null +++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/241.patch @@ -0,0 +1,30 @@ +From b8f9919f000e642fc8970d0a42c1bdadf5a9d720 Mon Sep 17 00:00:00 2001 +From: Gianfranco Costamagna +Date: Mon, 10 Aug 2020 08:30:34 +0200 +Subject: [PATCH] sd-daemon.c: Fix build with newer glibc and musl libc + +Reported by Khem Raj on meta-oe list + +TOPDIR/build/tmp/work/armv7vet2hf-neon-yoe-linux-musleabi/dlt-daemon/2.18.5-r0/recipe-sysroot/usr/include/sys/fcntl.h:1:2: error: redirecting incorrect #include to [-Werror,-W#warnings] + ^ +1 error generated. + +Signed-off-by: Gianfranco Costamagna +Signed-off-by: Gianfranco Costamagna +--- + systemd/3rdparty/sd-daemon.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/systemd/3rdparty/sd-daemon.c b/systemd/3rdparty/sd-daemon.c +index 88936d2..de3f985 100644 +--- a/systemd/3rdparty/sd-daemon.c ++++ b/systemd/3rdparty/sd-daemon.c +@@ -35,7 +35,7 @@ + #ifdef __BIONIC__ + #include + #else +-#include ++#include + #endif + #include + #include diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb index 8673c59fea..af8d9fddd7 100644 --- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb +++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb @@ -19,6 +19,7 @@ SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=https \ file://0004-Modify-systemd-config-directory.patch \ file://275.patch \ file://238.patch \ + file://241.patch \ " SRCREV = "f1ac087c766827b1d0ed9c3a814b3cc052e948f2" -- cgit 1.2.3-korg