summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2022-08-08 08:42:10 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-08-10 08:25:28 +0100
commit0e29a5003b03eb3cc5400e908942c837f70ec03d (patch)
treec61be523eb31d797dce34442d6089b8cfe5c6241
parentf335acfc812029166c37ec686da9a0a4cff6bb9d (diff)
downloadpoky-0e29a5003b03eb3cc5400e908942c837f70ec03d.tar.gz
ell: upgrade 0.51 -> 0.52
(From OE-Core rev: 987231e9606eb80211b9ee167b85f76e9f5667f0) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/ell/ell/0001-build-fix-time.h-related-breakage-on-musl.patch79
-rw-r--r--meta/recipes-core/ell/ell_0.52.bb (renamed from meta/recipes-core/ell/ell_0.51.bb)6
2 files changed, 2 insertions, 83 deletions
diff --git a/meta/recipes-core/ell/ell/0001-build-fix-time.h-related-breakage-on-musl.patch b/meta/recipes-core/ell/ell/0001-build-fix-time.h-related-breakage-on-musl.patch
deleted file mode 100644
index 02b5a9f21e..0000000000
--- a/meta/recipes-core/ell/ell/0001-build-fix-time.h-related-breakage-on-musl.patch
+++ /dev/null
@@ -1,79 +0,0 @@
1From cd9513a025174181b66ac13de45813f6e15727d3 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Milan=20P=2E=20Stani=C4=87?= <mps@arvanta.net>
3Date: Mon, 6 Jun 2022 22:05:39 +0200
4Subject: [PATCH] build: fix time.h related breakage on musl
5
6missing time.h for struct timeval usage
7forward declaration of struct timeval in time-private.h
8
9Upstream-Status: Backport
10Signed-off-by: Alexander Kanavin <alex@linutronix.de>
11---
12 ell/dhcp-transport.c | 1 +
13 ell/dhcp6-transport.c | 1 +
14 ell/icmp6.c | 1 +
15 ell/time-private.h | 2 +-
16 ell/time.c | 1 +
17 5 files changed, 5 insertions(+), 1 deletion(-)
18
19diff --git a/ell/dhcp-transport.c b/ell/dhcp-transport.c
20index ef030de..c4cf0ca 100644
21--- a/ell/dhcp-transport.c
22+++ b/ell/dhcp-transport.c
23@@ -40,6 +40,7 @@
24 #include <linux/filter.h>
25 #include <net/if_arp.h>
26 #include <errno.h>
27+#include <sys/time.h>
28
29 #include "io.h"
30 #include "util.h"
31diff --git a/ell/dhcp6-transport.c b/ell/dhcp6-transport.c
32index 30c425f..5ff6516 100644
33--- a/ell/dhcp6-transport.c
34+++ b/ell/dhcp6-transport.c
35@@ -35,6 +35,7 @@
36 #include <net/if.h>
37 #include <unistd.h>
38 #include <errno.h>
39+#include <sys/time.h>
40
41 #include "private.h"
42 #include "missing.h"
43diff --git a/ell/icmp6.c b/ell/icmp6.c
44index 368977f..7319903 100644
45--- a/ell/icmp6.c
46+++ b/ell/icmp6.c
47@@ -36,6 +36,7 @@
48 #include <net/if.h>
49 #include <unistd.h>
50 #include <errno.h>
51+#include <sys/time.h>
52
53 #include "private.h"
54 #include "useful.h"
55diff --git a/ell/time-private.h b/ell/time-private.h
56index 5295d94..83c23dd 100644
57--- a/ell/time-private.h
58+++ b/ell/time-private.h
59@@ -19,7 +19,7 @@
60 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
61 *
62 */
63-
64+struct timeval;
65 uint64_t _time_pick_interval_secs(uint32_t min_secs, uint32_t max_secs);
66 uint64_t _time_fuzz_msecs(uint64_t ms);
67 uint64_t _time_fuzz_secs(uint32_t secs, uint32_t max_offset);
68diff --git a/ell/time.c b/ell/time.c
69index 10e10b0..41e5725 100644
70--- a/ell/time.c
71+++ b/ell/time.c
72@@ -26,6 +26,7 @@
73
74 #define _GNU_SOURCE
75 #include <time.h>
76+#include <sys/time.h>
77
78 #include "time.h"
79 #include "time-private.h"
diff --git a/meta/recipes-core/ell/ell_0.51.bb b/meta/recipes-core/ell/ell_0.52.bb
index 806833bc7d..b2af0d04f0 100644
--- a/meta/recipes-core/ell/ell_0.51.bb
+++ b/meta/recipes-core/ell/ell_0.52.bb
@@ -14,10 +14,8 @@ DEPENDS = "dbus"
14 14
15inherit autotools pkgconfig 15inherit autotools pkgconfig
16 16
17SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/libs/${BPN}/${BPN}-${PV}.tar.xz \ 17SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/libs/${BPN}/${BPN}-${PV}.tar.xz"
18 file://0001-build-fix-time.h-related-breakage-on-musl.patch \ 18SRC_URI[sha256sum] = "83099b14beda2b253a2c69460f9613c5e955b63349e3c00cf2fd506f5b3ba7d0"
19 "
20SRC_URI[sha256sum] = "ba86cfa4aaf10151443edd63a7687914465d969f5dda00a2c1fcb11bd85e417f"
21 19
22do_configure:prepend () { 20do_configure:prepend () {
23 mkdir -p ${S}/build-aux 21 mkdir -p ${S}/build-aux