From 6a0efef15cd625d4fb4f60e2235450de0222c357 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= Date: Thu, 12 Jul 2018 14:05:50 +0200 Subject: [PATCH] ell: update to 0.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove upstreamed patch to fix musl build, and replace with another (submitted) patch to fix a new musl issue. Signed-off-by: Martin Hundebøll Signed-off-by: Khem Raj --- ...arp.h-from-libc-instead-of-linux-hea.patch | 39 +++++++++++++++++++ .../0001-ell-fix-build-with-musl-libc.patch | 39 ------------------- .../ell/{ell_0.4.bb => ell_0.6.bb} | 9 +++-- 3 files changed, 44 insertions(+), 43 deletions(-) create mode 100644 meta-oe/recipes-core/ell/ell/0001-dhcp-include-if_arp.h-from-libc-instead-of-linux-hea.patch delete mode 100644 meta-oe/recipes-core/ell/ell/0001-ell-fix-build-with-musl-libc.patch rename meta-oe/recipes-core/ell/{ell_0.4.bb => ell_0.6.bb} (63%) diff --git a/meta-oe/recipes-core/ell/ell/0001-dhcp-include-if_arp.h-from-libc-instead-of-linux-hea.patch b/meta-oe/recipes-core/ell/ell/0001-dhcp-include-if_arp.h-from-libc-instead-of-linux-hea.patch new file mode 100644 index 0000000000..df3c055d39 --- /dev/null +++ b/meta-oe/recipes-core/ell/ell/0001-dhcp-include-if_arp.h-from-libc-instead-of-linux-hea.patch @@ -0,0 +1,39 @@ +From d8236d1d789f496a193dae5d2a15d706b81f6482 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= +Date: Thu, 12 Jul 2018 10:19:50 +0200 +Subject: [PATCH] dhcp: include if_arp.h from libc instead of linux headers +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +To: ell@lists.01.org + +Compilation with musl libc fails due to redefinition of 'struct +arp{req,req_old,hdr}' in linux/if_arp.h, since it is already defined and +included in net/if_arp.h (through net/ethernet.h -> net/if_ether.h). + +The only symbols used from if_arp.h is ARPHRD_ETHER, so it should be +safe to avoid the compile error by including the if_arp.h header from +the c-library instead. + +Upstream-Status: Submitted [https://lists.01.org/pipermail/ell/2018-July/001242.html] +Signed-off-by: Martin Hundebøll +--- + ell/dhcp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ell/dhcp.c b/ell/dhcp.c +index 6c90370..0d99f74 100644 +--- a/ell/dhcp.c ++++ b/ell/dhcp.c +@@ -27,7 +27,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + +-- +2.18.0 + diff --git a/meta-oe/recipes-core/ell/ell/0001-ell-fix-build-with-musl-libc.patch b/meta-oe/recipes-core/ell/ell/0001-ell-fix-build-with-musl-libc.patch deleted file mode 100644 index a172a93ca5..0000000000 --- a/meta-oe/recipes-core/ell/ell/0001-ell-fix-build-with-musl-libc.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 4f8c68757b05d12392cd1a8aed174cb8e56f80e3 Mon Sep 17 00:00:00 2001 -From: "Maxin B. John" -Date: Thu, 5 Apr 2018 17:19:44 +0300 -Subject: [PATCH] ell: fix build with musl libc - -musl libc doesn't implement TEMP_FAILURE_RETRY. Use the -TEMP_FAILURE_RETRY from glibc to fix build. - -Upstream-Status: Submitted [https://lists.01.org/pipermail/ell/2018-April/001209.html] - -Signed-off-by: Maxin B. John ---- - ell/dbus.h | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/ell/dbus.h b/ell/dbus.h -index a7c08d2..3ff5e0f 100644 ---- a/ell/dbus.h -+++ b/ell/dbus.h -@@ -28,6 +28,16 @@ - #include - #include - -+/* taken from glibc unistd.h for musl support */ -+#ifndef TEMP_FAILURE_RETRY -+#define TEMP_FAILURE_RETRY(expression) \ -+ (__extension__ \ -+ ({ long int __result; \ -+ do __result = (long int) (expression); \ -+ while (__result == -1L && errno == EINTR); \ -+ __result; })) -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif --- -2.4.0 - diff --git a/meta-oe/recipes-core/ell/ell_0.4.bb b/meta-oe/recipes-core/ell/ell_0.6.bb similarity index 63% rename from meta-oe/recipes-core/ell/ell_0.4.bb rename to meta-oe/recipes-core/ell/ell_0.6.bb index 1524bd6b91..399eddb07d 100644 --- a/meta-oe/recipes-core/ell/ell_0.4.bb +++ b/meta-oe/recipes-core/ell/ell_0.6.bb @@ -7,10 +7,11 @@ SECTION = "libs" inherit autotools pkgconfig S = "${WORKDIR}/git" -SRCREV = "b4aea06fabb2af1af01f861f8f394c75950b6d47" -SRC_URI = "git://git.kernel.org/pub/scm/libs/ell/ell.git \ - file://0001-ell-fix-build-with-musl-libc.patch \ - " +SRCREV = "59ff3160fe55a841e662f8776f0520f2038235f4" +SRC_URI = " \ + git://git.kernel.org/pub/scm/libs/ell/ell.git \ + file://0001-dhcp-include-if_arp.h-from-libc-instead-of-linux-hea.patch \ +" do_configure_prepend () { mkdir ${S}/build-aux