diff options
author | Gianfranco Costamagna <costamagna.gianfranco@gmail.com> | 2020-08-10 08:46:33 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-08-10 11:04:21 -0700 |
commit | a7c9aa13dd94712ea49f535fbbf38d2db54cf7e2 (patch) | |
tree | 84b1c95408f0d7c4c505a8f8c6b87d680641e201 /meta-oe/recipes-extended/dlt-daemon | |
parent | 0b3ee7c8ba1e80fbfe86dbcf20dd5e51aaf1d8ff (diff) | |
download | meta-openembedded-contrib-a7c9aa13dd94712ea49f535fbbf38d2db54cf7e2.tar.gz |
dlt-daemon: fix build with upstream-proposed patch for MUSL libc
Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended/dlt-daemon')
-rw-r--r-- | meta-oe/recipes-extended/dlt-daemon/dlt-daemon/241.patch | 30 | ||||
-rw-r--r-- | meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.5.bb | 1 |
2 files changed, 31 insertions, 0 deletions
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 <costamagnagianfranco@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 <costamagnagianfranco@yahoo.it> +Signed-off-by: Gianfranco Costamagna <locutusofborg@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 e7a194ac80..3a2b405157 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 @@ -18,6 +18,7 @@ SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=https \ file://0002-Don-t-execute-processes-as-a-specific-user.patch \ file://0004-Modify-systemd-config-directory.patch \ file://238.patch \ + file://241.patch \ " SRCREV = "f1ac087c766827b1d0ed9c3a814b3cc052e948f2" |