From 193236933b0f4ab91b1625b64e2187e2db4e0e8f Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 5 Apr 2019 15:28:33 -0400 Subject: reset upstream subtrees to HEAD Reset the following subtrees on HEAD: poky: 8217b477a1(master) meta-xilinx: 64aa3d35ae(master) meta-openembedded: 0435c9e193(master) meta-raspberrypi: 490a4441ac(master) meta-security: cb6d1c85ee(master) Squashed patches: meta-phosphor: drop systemd 239 patches meta-phosphor: mrw-api: use correct install path Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d Signed-off-by: Brad Bishop --- ...e-if_arp.h-from-libc-instead-of-linux-hea.patch | 39 ---------------------- .../meta-oe/recipes-core/ell/ell_0.17.bb | 17 ++++++++++ .../meta-oe/recipes-core/ell/ell_0.8.bb | 17 ---------- 3 files changed, 17 insertions(+), 56 deletions(-) delete mode 100644 meta-openembedded/meta-oe/recipes-core/ell/ell/0001-dhcp-include-if_arp.h-from-libc-instead-of-linux-hea.patch create mode 100644 meta-openembedded/meta-oe/recipes-core/ell/ell_0.17.bb delete mode 100644 meta-openembedded/meta-oe/recipes-core/ell/ell_0.8.bb (limited to 'meta-openembedded/meta-oe/recipes-core/ell') diff --git a/meta-openembedded/meta-oe/recipes-core/ell/ell/0001-dhcp-include-if_arp.h-from-libc-instead-of-linux-hea.patch b/meta-openembedded/meta-oe/recipes-core/ell/ell/0001-dhcp-include-if_arp.h-from-libc-instead-of-linux-hea.patch deleted file mode 100644 index ada65401a..000000000 --- a/meta-openembedded/meta-oe/recipes-core/ell/ell/0001-dhcp-include-if_arp.h-from-libc-instead-of-linux-hea.patch +++ /dev/null @@ -1,39 +0,0 @@ -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: Backport [https://lists.01.org/pipermail/ell/2018-July/001244.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-openembedded/meta-oe/recipes-core/ell/ell_0.17.bb b/meta-openembedded/meta-oe/recipes-core/ell/ell_0.17.bb new file mode 100644 index 000000000..27f11cfbe --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/ell/ell_0.17.bb @@ -0,0 +1,17 @@ +SUMMARY = "Embedded Linux Library" +DESCRIPTION = "ELL is a DBUS library which provides DBUS bindings." +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" +SECTION = "libs" + +inherit autotools pkgconfig + +S = "${WORKDIR}/git" +SRCREV = "ebc021cee3b2d20ca2af5e3ed02495da616b2fd3" +SRC_URI = "git://git.kernel.org/pub/scm/libs/ell/ell.git" + +do_configure_prepend () { + mkdir -p ${S}/build-aux +} + +DEPENDS = "dbus" diff --git a/meta-openembedded/meta-oe/recipes-core/ell/ell_0.8.bb b/meta-openembedded/meta-oe/recipes-core/ell/ell_0.8.bb deleted file mode 100644 index 0428cab28..000000000 --- a/meta-openembedded/meta-oe/recipes-core/ell/ell_0.8.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Embedded Linux Library" -DESCRIPTION = "ELL is a DBUS library which provides DBUS bindings." -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" -SECTION = "libs" - -inherit autotools pkgconfig - -S = "${WORKDIR}/git" -SRCREV = "d572281caedef357c392a7c9aa65a3b21a18cfdb" -SRC_URI = "git://git.kernel.org/pub/scm/libs/ell/ell.git" - -do_configure_prepend () { - mkdir -p ${S}/build-aux -} - -DEPENDS = "dbus" -- cgit v1.2.1