From: Gianfranco Costamagna <costamagna.gianfra...@gmail.com>
Signed-off-by: Gianfranco Costamagna <costamagnagianfra...@yahoo.it>
Signed-off-by: Gianfranco Costamagna <locutusofb...@debian.org>
Signed-off-by: Khem Raj <raj.k...@gmail.com>
(cherry picked from commit a7c9aa13dd94712ea49f535fbbf38d2db54cf7e2)
Signed-off-by: Scott Murray <scott.mur...@konsulko.com>
Signed-off-by: Armin Kuster <akuster...@gmail.com>
---
.../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 <costamagnagianfra...@yahoo.it>
+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 <sys/fcntl.h> to <fcntl.h>
[-Werror,-W#warnings]
+ ^
+1 error generated.
+
+Signed-off-by: Gianfranco Costamagna <costamagnagianfra...@yahoo.it>
+Signed-off-by: Gianfranco Costamagna <locutusofb...@debian.org>
+---
+ 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 <linux/fcntl.h>
+ #else
+-#include <sys/fcntl.h>
++#include <fcntl.h>
+ #endif
+ #include <netinet/in.h>
+ #include <stdlib.h>
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"
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#92855):
https://lists.openembedded.org/g/openembedded-devel/message/92855
Mute This Topic: https://lists.openembedded.org/mt/85398109/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
