* [Buildroot] [PATCH v3 1/2] ell: bump version to 0.14
@ 2018-11-09 23:17 Peter Seiderer
2018-11-09 23:17 ` [Buildroot] [PATCH v3 2/2] iwd: new package Peter Seiderer
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Peter Seiderer @ 2018-11-09 23:17 UTC (permalink / raw)
To: buildroot
- remove superseeded patch 0001-ell-signal.h-use-standard-sigset_t-fixes-musl-compil.patch
- add patch for missing l_genl_family_set_unicast_handler symbol export
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
Changes v2 -> v3:
- new patch (needed by iwd update to 0.11)
---
...missing-l_genl_family_set_unicast_ha.patch | 30 ++++++++++
...-standard-sigset_t-fixes-musl-compil.patch | 57 -------------------
package/ell/ell.hash | 2 +-
package/ell/ell.mk | 2 +-
4 files changed, 32 insertions(+), 59 deletions(-)
create mode 100644 package/ell/0001-ell-ell.sym-add-missing-l_genl_family_set_unicast_ha.patch
delete mode 100644 package/ell/0001-ell-signal.h-use-standard-sigset_t-fixes-musl-compil.patch
diff --git a/package/ell/0001-ell-ell.sym-add-missing-l_genl_family_set_unicast_ha.patch b/package/ell/0001-ell-ell.sym-add-missing-l_genl_family_set_unicast_ha.patch
new file mode 100644
index 0000000000..e521a93f7a
--- /dev/null
+++ b/package/ell/0001-ell-ell.sym-add-missing-l_genl_family_set_unicast_ha.patch
@@ -0,0 +1,30 @@
+From e68d797ffdfe768c1e4a356add5bb12c43f40a72 Mon Sep 17 00:00:00 2001
+From: Peter Seiderer <ps.report@gmx.net>
+Date: Fri, 9 Nov 2018 23:28:39 +0100
+Subject: [PATCH] ell/ell.sym: add missing l_genl_family_set_unicast_handler
+
+Fixes iwd compile failure:
+
+ src/netdev.o: In function `netdev_set_nl80211':
+ netdev.c:(.text+0x6f04): undefined reference to `l_genl_family_set_unicast_handler'
+
+Signed-off-by: Peter Seiderer <ps.report@gmx.net>
+---
+ ell/ell.sym | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/ell/ell.sym b/ell/ell.sym
+index 614bc93..cdd2c21 100644
+--- a/ell/ell.sym
++++ b/ell/ell.sym
+@@ -257,6 +257,7 @@ global:
+ l_genl_family_new;
+ l_genl_family_ref;
+ l_genl_family_unref;
++ l_genl_family_set_unicast_handler;
+ l_genl_family_set_watches;
+ l_genl_family_get_version;
+ l_genl_family_get_genl;
+--
+2.19.1
+
diff --git a/package/ell/0001-ell-signal.h-use-standard-sigset_t-fixes-musl-compil.patch b/package/ell/0001-ell-signal.h-use-standard-sigset_t-fixes-musl-compil.patch
deleted file mode 100644
index a1d252b42a..0000000000
--- a/package/ell/0001-ell-signal.h-use-standard-sigset_t-fixes-musl-compil.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From abff9db9a6e86e00613a420dd6a0ba3bc81e2b72 Mon Sep 17 00:00:00 2001
-From: Peter Seiderer <ps.report@gmx.net>
-Date: Fri, 2 Nov 2018 12:58:57 +0100
-Subject: [PATCH] ell/signal.h: use standard sigset_t, fixes musl compile
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Use standard sigset_t (instead __sigset_t):
-
-- fixes musl compile
-- fies mismatch between header and implementation file
-
-Fixes:
-
- In file included from ell/main.c:35:0:
- ell/signal.h:39:40: error: unknown type name ?__sigset_t?
- struct l_signal *l_signal_create(const __sigset_t *mask,
- ^~~~~~~~~~
- In file included from ell/signal.c:35:0:
- ell/signal.h:39:40: error: unknown type name ?__sigset_t?
- struct l_signal *l_signal_create(const __sigset_t *mask,
- ^~~~~~~~~~
- ell/signal.c:153:29: error: conflicting types for ?l_signal_create?
- LIB_EXPORT struct l_signal *l_signal_create(const sigset_t *mask,
- ^~~~~~~~~~~~~~~
- In file included from ell/signal.c:35:0:
- ell/signal.h:39:18: note: previous declaration of ?l_signal_create? was here
- struct l_signal *l_signal_create(const __sigset_t *mask,
- ^~~~~~~~~~~~~~~
-
-Reverts upstream commit [1], superseeded in the next version by [2].
-
-[1] https://git.kernel.org/pub/scm/libs/ell/ell.git/commit/?id=7af8e3ba0ed522897f5a87e6c8f2980f82ff5012
-[2] https://git.kernel.org/pub/scm/libs/ell/ell.git/commit/?id=4a386a10d88ff52097a974167ab889b3fc2add70
-
-Signed-off-by: Peter Seiderer <ps.report@gmx.net>
----
- ell/signal.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ell/signal.h b/ell/signal.h
-index 0d4fdc8..98cf0fa 100644
---- a/ell/signal.h
-+++ b/ell/signal.h
-@@ -36,7 +36,7 @@ typedef void (*l_signal_notify_cb_t) (struct l_signal *signal,
- uint32_t signo, void *user_data);
- typedef void (*l_signal_destroy_cb_t) (void *user_data);
-
--struct l_signal *l_signal_create(const __sigset_t *mask,
-+struct l_signal *l_signal_create(const sigset_t *mask,
- l_signal_notify_cb_t callback,
- void *user_data, l_signal_destroy_cb_t destroy);
- void l_signal_remove(struct l_signal *signal);
---
-2.19.1
-
diff --git a/package/ell/ell.hash b/package/ell/ell.hash
index c6b23baec8..84827437ec 100644
--- a/package/ell/ell.hash
+++ b/package/ell/ell.hash
@@ -1,5 +1,5 @@
# Locally computed
-sha256 8e629347d49d30418e215ccf80f05eb6ff617f752396f93287ed723169aec006 ell-0.13.tar.gz
+sha256 1791d2e18f0089af0d58a3d2f76a2846c2d9fa59eb2848124a713ce380561b0e ell-0.14.tar.gz
# License files
sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING
diff --git a/package/ell/ell.mk b/package/ell/ell.mk
index 8ea95a6d77..56d53be868 100644
--- a/package/ell/ell.mk
+++ b/package/ell/ell.mk
@@ -4,7 +4,7 @@
#
################################################################################
-ELL_VERSION = 0.13
+ELL_VERSION = 0.14
ELL_SITE = https://git.kernel.org/pub/scm/libs/ell/ell.git
ELL_SITE_METHOD = git
ELL_LICENSE = LGPL-2.1+
--
2.19.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [Buildroot] [PATCH v3 2/2] iwd: new package 2018-11-09 23:17 [Buildroot] [PATCH v3 1/2] ell: bump version to 0.14 Peter Seiderer @ 2018-11-09 23:17 ` Peter Seiderer 2018-11-10 14:04 ` Peter Seiderer 2018-11-10 14:02 ` [Buildroot] [PATCH v3 1/2] ell: bump version to 0.14 Peter Seiderer 2018-11-14 10:50 ` Thomas Petazzoni 2 siblings, 1 reply; 5+ messages in thread From: Peter Seiderer @ 2018-11-09 23:17 UTC (permalink / raw) To: buildroot Signed-off-by: Peter Seiderer <ps.report@gmx.net> --- Changes v1 -> v2: - update patch 0003-Fix-__iwd_backtrace_init-availability-detection.patch - fix iwd needs comment (missing depends on BR2_TOOLCHAIN_HAS_SYNC_4) - moved GPL-3.0+ (client) to enable client section - add DEVELOPERS entry Changes v2 -> v3: - update to 0.11: fixes iwd-client readline/uclibc related compile failure (reported by Thomas Petazzoni), remove upstream fixed utf8.h patch - rebase/reorder remaining patches --- DEVELOPERS | 1 + package/Config.in | 1 + ...cap.c-add-missing-sys-stat.h-include.patch | 46 ++++++++++++++ ...acktrace_init-availability-detection.patch | 62 +++++++++++++++++++ package/iwd/Config.in | 14 +++++ package/iwd/iwd.hash | 5 ++ package/iwd/iwd.mk | 47 ++++++++++++++ 7 files changed, 176 insertions(+) create mode 100644 package/iwd/0001-monitor-pcap.c-add-missing-sys-stat.h-include.patch create mode 100644 package/iwd/0002-Fix-__iwd_backtrace_init-availability-detection.patch create mode 100644 package/iwd/Config.in create mode 100644 package/iwd/iwd.hash create mode 100644 package/iwd/iwd.mk diff --git a/DEVELOPERS b/DEVELOPERS index 53467da489..d2c553a2ca 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1660,6 +1660,7 @@ F: package/ghostscript-fonts/ F: package/gstreamer1/gst1-interpipe/ F: package/gstreamer1/gst1-validate/ F: package/gstreamer1/gstreamer1-editing-services/ +F: package/iwd/ F: package/libevdev/ F: package/log4cplus/ F: package/postgresql/ diff --git a/package/Config.in b/package/Config.in index b60e7700ad..2f2c0dc4e3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1866,6 +1866,7 @@ menu "Networking applications" source "package/iputils/Config.in" source "package/irssi/Config.in" source "package/iw/Config.in" + source "package/iwd/Config.in" source "package/janus-gateway/Config.in" source "package/keepalived/Config.in" source "package/kismet/Config.in" diff --git a/package/iwd/0001-monitor-pcap.c-add-missing-sys-stat.h-include.patch b/package/iwd/0001-monitor-pcap.c-add-missing-sys-stat.h-include.patch new file mode 100644 index 0000000000..83be65dcd1 --- /dev/null +++ b/package/iwd/0001-monitor-pcap.c-add-missing-sys-stat.h-include.patch @@ -0,0 +1,46 @@ +From a879fc32d58625bd9361219c1285ab6e5f012467 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer <ps.report@gmx.net> +Date: Fri, 2 Nov 2018 14:29:53 +0100 +Subject: [PATCH] monitor/pcap.c: add missing sys/stat.h include +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes: + + CC monitor/pcap.o + monitor/pcap.c: In function ?pcap_create?: + monitor/pcap.c:121:6: error: ?S_IRUSR? undeclared (first use in this function) + S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); + ^ + monitor/pcap.c:121:6: note: each undeclared identifier is reported only once for each function it appears in + monitor/pcap.c:121:16: error: ?S_IWUSR? undeclared (first use in this function) + S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); + ^ + monitor/pcap.c:121:26: error: ?S_IRGRP? undeclared (first use in this function) + S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); + ^ + monitor/pcap.c:121:36: error: ?S_IROTH? undeclared (first use in this function) + S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); + ^ + +Signed-off-by: Peter Seiderer <ps.report@gmx.net> +--- + monitor/pcap.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/monitor/pcap.c b/monitor/pcap.c +index 54ad9f5..785aefa 100644 +--- a/monitor/pcap.c ++++ b/monitor/pcap.c +@@ -29,6 +29,7 @@ + #include <fcntl.h> + #include <unistd.h> + #include <stdlib.h> ++#include <sys/stat.h> + #include <sys/uio.h> + #include <sys/types.h> + #include <ell/ell.h> +-- +2.19.1 + diff --git a/package/iwd/0002-Fix-__iwd_backtrace_init-availability-detection.patch b/package/iwd/0002-Fix-__iwd_backtrace_init-availability-detection.patch new file mode 100644 index 0000000000..53eeca0595 --- /dev/null +++ b/package/iwd/0002-Fix-__iwd_backtrace_init-availability-detection.patch @@ -0,0 +1,62 @@ +From 124f6437c246b60f4254651d95b65140b8964ccc Mon Sep 17 00:00:00 2001 +From: Peter Seiderer <ps.report@gmx.net> +Date: Fri, 2 Nov 2018 14:38:37 +0100 +Subject: [PATCH] Fix __iwd_backtrace_init() availability detection + +Check for HAVE_EXECINFO_H for all __iwd_backtrace_init usages (and +remove unused backtrace.h usage from plugins/ofono.c). + +Fixes: + + src/main.o: In function `main': + main.c:(.text.startup+0x798): undefined reference to `__iwd_backtrace_init' + collect2: error: ld returned 1 exit status + +Signed-off-by: Peter Seiderer <ps.report@gmx.net> +--- + plugins/ofono.c | 1 - + src/backtrace.h | 2 +- + src/main.c | 2 +- + 3 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/plugins/ofono.c b/plugins/ofono.c +index 8c019ce..077045f 100644 +--- a/plugins/ofono.c ++++ b/plugins/ofono.c +@@ -31,7 +31,6 @@ + + #include "src/dbus.h" + #include "src/simauth.h" +-#include "src/backtrace.h" + + /* + * This plugin takes care of all the communication with ofono in order to +diff --git a/src/backtrace.h b/src/backtrace.h +index bfdc858..829ba02 100644 +--- a/src/backtrace.h ++++ b/src/backtrace.h +@@ -19,7 +19,7 @@ + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + */ +-#ifdef __GLIBC__ ++#ifdef HAVE_EXECINFO_H + void __iwd_backtrace_init(); + void __iwd_backtrace_print(unsigned int offset); + #endif +diff --git a/src/main.c b/src/main.c +index c1a2c42..8035fa0 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -445,7 +445,7 @@ int main(int argc, char *argv[]) + if (debugopt) + l_debug_enable(debugopt); + +-#ifdef __GLIBC__ ++#ifdef HAVE_EXECINFO_H + __iwd_backtrace_init(); + #endif + +-- +2.19.1 + diff --git a/package/iwd/Config.in b/package/iwd/Config.in new file mode 100644 index 0000000000..c790f3dba1 --- /dev/null +++ b/package/iwd/Config.in @@ -0,0 +1,14 @@ +config BR2_PACKAGE_IWD + bool "iwd" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # ell + depends on !BR2_STATIC_LIBS # ell + depends on BR2_USE_WCHAR # ell + select BR2_PACKAGE_ELL + help + iNet Wireless daemon (iwd) + + https://iwd.wiki.kernel.org/ + +comment "iwd needs a toolchain w/ dynamic library, wchar" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # ell + depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR diff --git a/package/iwd/iwd.hash b/package/iwd/iwd.hash new file mode 100644 index 0000000000..cc3d419560 --- /dev/null +++ b/package/iwd/iwd.hash @@ -0,0 +1,5 @@ +# Locally computed +sha256 a4f9798d6a203396af06813adb52dce9708d2ad5726a86305435b1174e9b4cb2 iwd-0.11.tar.gz + +# License files +sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk new file mode 100644 index 0000000000..2ff8f88cf8 --- /dev/null +++ b/package/iwd/iwd.mk @@ -0,0 +1,47 @@ +################################################################################ +# +# iwd +# +################################################################################ + +IWD_VERSION = 0.11 +IWD_SITE = https://git.kernel.org/pub/scm/network/wireless/iwd.git +IWD_SITE_METHOD = git +IWD_LICENSE = LGPL-2.1+ +IWD_LICENSE_FILES = COPYING +# sources from git, no configure script provided +IWD_AUTORECONF = YES + +IWD_CONF_OPTS = --enable-external-ell +IWD_DEPENDENCIES = ell + +# autoreconf requires an existing build-aux directory +define IWD_MKDIR_BUILD_AUX + mkdir -p $(@D)/build-aux +endef +IWD_POST_PATCH_HOOKS += IWD_MKDIR_BUILD_AUX + +ifeq ($(BR2_PACKAGE_DBUS),y) +IWD_CONF_OPTS += --enable-dbus-policy +IWD_DEPENDENCIES += dbus +else +IWD_CONF_OPTS += --disable-dbus-policy +endif + +ifeq ($(BR2_PACKAGE_READLINE),y) +# iwd client depends on readline (GPL-3.0+) +IWD_LICENSE := $(IWD_LICENSE), GPL-3.0+ (client) +IWD_CONF_OPTS += --enable-client +IWD_DEPENDENCIES += readline +else +IWD_CONF_OPTS += --disable-client +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +IWD_CONF_OPTS += --enable-systemd-service +IWD_DEPENDENCIES += systemd +else +IWD_CONF_OPTS += --disable-systemd-service +endif + +$(eval $(autotools-package)) -- 2.19.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v3 2/2] iwd: new package 2018-11-09 23:17 ` [Buildroot] [PATCH v3 2/2] iwd: new package Peter Seiderer @ 2018-11-10 14:04 ` Peter Seiderer 0 siblings, 0 replies; 5+ messages in thread From: Peter Seiderer @ 2018-11-10 14:04 UTC (permalink / raw) To: buildroot On Sat, 10 Nov 2018 00:17:25 +0100, Peter Seiderer <ps.report@gmx.net> wrote: > Signed-off-by: Peter Seiderer <ps.report@gmx.net> > --- > Changes v1 -> v2: > - update patch 0003-Fix-__iwd_backtrace_init-availability-detection.patch > - fix iwd needs comment (missing depends on BR2_TOOLCHAIN_HAS_SYNC_4) > - moved GPL-3.0+ (client) to enable client section > - add DEVELOPERS entry > > Changes v2 -> v3: > - update to 0.11: fixes iwd-client readline/uclibc related > compile failure (reported by Thomas Petazzoni), remove > upstream fixed utf8.h patch > - rebase/reorder remaining patches > --- > DEVELOPERS | 1 + > package/Config.in | 1 + > ...cap.c-add-missing-sys-stat.h-include.patch | 46 ++++++++++++++ > ...acktrace_init-availability-detection.patch | 62 +++++++++++++++++++ > package/iwd/Config.in | 14 +++++ > package/iwd/iwd.hash | 5 ++ > package/iwd/iwd.mk | 47 ++++++++++++++ > 7 files changed, 176 insertions(+) > create mode 100644 package/iwd/0001-monitor-pcap.c-add-missing-sys-stat.h-include.patch > create mode 100644 package/iwd/0002-Fix-__iwd_backtrace_init-availability-detection.patch > create mode 100644 package/iwd/Config.in > create mode 100644 package/iwd/iwd.hash > create mode 100644 package/iwd/iwd.mk > > diff --git a/DEVELOPERS b/DEVELOPERS > index 53467da489..d2c553a2ca 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1660,6 +1660,7 @@ F: package/ghostscript-fonts/ > F: package/gstreamer1/gst1-interpipe/ > F: package/gstreamer1/gst1-validate/ > F: package/gstreamer1/gstreamer1-editing-services/ > +F: package/iwd/ > F: package/libevdev/ > F: package/log4cplus/ > F: package/postgresql/ > diff --git a/package/Config.in b/package/Config.in > index b60e7700ad..2f2c0dc4e3 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1866,6 +1866,7 @@ menu "Networking applications" > source "package/iputils/Config.in" > source "package/irssi/Config.in" > source "package/iw/Config.in" > + source "package/iwd/Config.in" > source "package/janus-gateway/Config.in" > source "package/keepalived/Config.in" > source "package/kismet/Config.in" > diff --git a/package/iwd/0001-monitor-pcap.c-add-missing-sys-stat.h-include.patch b/package/iwd/0001-monitor-pcap.c-add-missing-sys-stat.h-include.patch Patch upstream suggested: https://lists.01.org/pipermail/iwd/2018-November/005068.html > new file mode 100644 > index 0000000000..83be65dcd1 > --- /dev/null > +++ b/package/iwd/0001-monitor-pcap.c-add-missing-sys-stat.h-include.patch > @@ -0,0 +1,46 @@ > +From a879fc32d58625bd9361219c1285ab6e5f012467 Mon Sep 17 00:00:00 2001 > +From: Peter Seiderer <ps.report@gmx.net> > +Date: Fri, 2 Nov 2018 14:29:53 +0100 > +Subject: [PATCH] monitor/pcap.c: add missing sys/stat.h include > +MIME-Version: 1.0 > +Content-Type: text/plain; charset=UTF-8 > +Content-Transfer-Encoding: 8bit > + > +Fixes: > + > + CC monitor/pcap.o > + monitor/pcap.c: In function ?pcap_create?: > + monitor/pcap.c:121:6: error: ?S_IRUSR? undeclared (first use in this function) > + S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); > + ^ > + monitor/pcap.c:121:6: note: each undeclared identifier is reported only once for each function it appears in > + monitor/pcap.c:121:16: error: ?S_IWUSR? undeclared (first use in this function) > + S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); > + ^ > + monitor/pcap.c:121:26: error: ?S_IRGRP? undeclared (first use in this function) > + S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); > + ^ > + monitor/pcap.c:121:36: error: ?S_IROTH? undeclared (first use in this function) > + S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); > + ^ > + > +Signed-off-by: Peter Seiderer <ps.report@gmx.net> > +--- > + monitor/pcap.c | 1 + > + 1 file changed, 1 insertion(+) > + > +diff --git a/monitor/pcap.c b/monitor/pcap.c > +index 54ad9f5..785aefa 100644 > +--- a/monitor/pcap.c > ++++ b/monitor/pcap.c > +@@ -29,6 +29,7 @@ > + #include <fcntl.h> > + #include <unistd.h> > + #include <stdlib.h> > ++#include <sys/stat.h> > + #include <sys/uio.h> > + #include <sys/types.h> > + #include <ell/ell.h> > +-- > +2.19.1 > + > diff --git a/package/iwd/0002-Fix-__iwd_backtrace_init-availability-detection.patch b/package/iwd/0002-Fix-__iwd_backtrace_init-availability-detection.patch Patch upstream suggested: https://lists.01.org/pipermail/iwd/2018-November/005069.html Regards, Peter > new file mode 100644 > index 0000000000..53eeca0595 > --- /dev/null > +++ b/package/iwd/0002-Fix-__iwd_backtrace_init-availability-detection.patch > @@ -0,0 +1,62 @@ > +From 124f6437c246b60f4254651d95b65140b8964ccc Mon Sep 17 00:00:00 2001 > +From: Peter Seiderer <ps.report@gmx.net> > +Date: Fri, 2 Nov 2018 14:38:37 +0100 > +Subject: [PATCH] Fix __iwd_backtrace_init() availability detection > + > +Check for HAVE_EXECINFO_H for all __iwd_backtrace_init usages (and > +remove unused backtrace.h usage from plugins/ofono.c). > + > +Fixes: > + > + src/main.o: In function `main': > + main.c:(.text.startup+0x798): undefined reference to `__iwd_backtrace_init' > + collect2: error: ld returned 1 exit status > + > +Signed-off-by: Peter Seiderer <ps.report@gmx.net> > +--- > + plugins/ofono.c | 1 - > + src/backtrace.h | 2 +- > + src/main.c | 2 +- > + 3 files changed, 2 insertions(+), 3 deletions(-) > + > +diff --git a/plugins/ofono.c b/plugins/ofono.c > +index 8c019ce..077045f 100644 > +--- a/plugins/ofono.c > ++++ b/plugins/ofono.c > +@@ -31,7 +31,6 @@ > + > + #include "src/dbus.h" > + #include "src/simauth.h" > +-#include "src/backtrace.h" > + > + /* > + * This plugin takes care of all the communication with ofono in order to > +diff --git a/src/backtrace.h b/src/backtrace.h > +index bfdc858..829ba02 100644 > +--- a/src/backtrace.h > ++++ b/src/backtrace.h > +@@ -19,7 +19,7 @@ > + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA > + * > + */ > +-#ifdef __GLIBC__ > ++#ifdef HAVE_EXECINFO_H > + void __iwd_backtrace_init(); > + void __iwd_backtrace_print(unsigned int offset); > + #endif > +diff --git a/src/main.c b/src/main.c > +index c1a2c42..8035fa0 100644 > +--- a/src/main.c > ++++ b/src/main.c > +@@ -445,7 +445,7 @@ int main(int argc, char *argv[]) > + if (debugopt) > + l_debug_enable(debugopt); > + > +-#ifdef __GLIBC__ > ++#ifdef HAVE_EXECINFO_H > + __iwd_backtrace_init(); > + #endif > + > +-- > +2.19.1 > + > diff --git a/package/iwd/Config.in b/package/iwd/Config.in > new file mode 100644 > index 0000000000..c790f3dba1 > --- /dev/null > +++ b/package/iwd/Config.in > @@ -0,0 +1,14 @@ > +config BR2_PACKAGE_IWD > + bool "iwd" > + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # ell > + depends on !BR2_STATIC_LIBS # ell > + depends on BR2_USE_WCHAR # ell > + select BR2_PACKAGE_ELL > + help > + iNet Wireless daemon (iwd) > + > + https://iwd.wiki.kernel.org/ > + > +comment "iwd needs a toolchain w/ dynamic library, wchar" > + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # ell > + depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR > diff --git a/package/iwd/iwd.hash b/package/iwd/iwd.hash > new file mode 100644 > index 0000000000..cc3d419560 > --- /dev/null > +++ b/package/iwd/iwd.hash > @@ -0,0 +1,5 @@ > +# Locally computed > +sha256 a4f9798d6a203396af06813adb52dce9708d2ad5726a86305435b1174e9b4cb2 iwd-0.11.tar.gz > + > +# License files > +sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING > diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk > new file mode 100644 > index 0000000000..2ff8f88cf8 > --- /dev/null > +++ b/package/iwd/iwd.mk > @@ -0,0 +1,47 @@ > +################################################################################ > +# > +# iwd > +# > +################################################################################ > + > +IWD_VERSION = 0.11 > +IWD_SITE = https://git.kernel.org/pub/scm/network/wireless/iwd.git > +IWD_SITE_METHOD = git > +IWD_LICENSE = LGPL-2.1+ > +IWD_LICENSE_FILES = COPYING > +# sources from git, no configure script provided > +IWD_AUTORECONF = YES > + > +IWD_CONF_OPTS = --enable-external-ell > +IWD_DEPENDENCIES = ell > + > +# autoreconf requires an existing build-aux directory > +define IWD_MKDIR_BUILD_AUX > + mkdir -p $(@D)/build-aux > +endef > +IWD_POST_PATCH_HOOKS += IWD_MKDIR_BUILD_AUX > + > +ifeq ($(BR2_PACKAGE_DBUS),y) > +IWD_CONF_OPTS += --enable-dbus-policy > +IWD_DEPENDENCIES += dbus > +else > +IWD_CONF_OPTS += --disable-dbus-policy > +endif > + > +ifeq ($(BR2_PACKAGE_READLINE),y) > +# iwd client depends on readline (GPL-3.0+) > +IWD_LICENSE := $(IWD_LICENSE), GPL-3.0+ (client) > +IWD_CONF_OPTS += --enable-client > +IWD_DEPENDENCIES += readline > +else > +IWD_CONF_OPTS += --disable-client > +endif > + > +ifeq ($(BR2_PACKAGE_SYSTEMD),y) > +IWD_CONF_OPTS += --enable-systemd-service > +IWD_DEPENDENCIES += systemd > +else > +IWD_CONF_OPTS += --disable-systemd-service > +endif > + > +$(eval $(autotools-package)) ^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v3 1/2] ell: bump version to 0.14 2018-11-09 23:17 [Buildroot] [PATCH v3 1/2] ell: bump version to 0.14 Peter Seiderer 2018-11-09 23:17 ` [Buildroot] [PATCH v3 2/2] iwd: new package Peter Seiderer @ 2018-11-10 14:02 ` Peter Seiderer 2018-11-14 10:50 ` Thomas Petazzoni 2 siblings, 0 replies; 5+ messages in thread From: Peter Seiderer @ 2018-11-10 14:02 UTC (permalink / raw) To: buildroot On Sat, 10 Nov 2018 00:17:24 +0100, Peter Seiderer <ps.report@gmx.net> wrote: > - remove superseeded patch 0001-ell-signal.h-use-standard-sigset_t-fixes-musl-compil.patch > - add patch for missing l_genl_family_set_unicast_handler symbol export Patch upstream suggested: https://lists.01.org/pipermail/ell/2018-November/001397.html Regards, Peter > > Signed-off-by: Peter Seiderer <ps.report@gmx.net> > --- > Changes v2 -> v3: > - new patch (needed by iwd update to 0.11) > --- > ...missing-l_genl_family_set_unicast_ha.patch | 30 ++++++++++ > ...-standard-sigset_t-fixes-musl-compil.patch | 57 ------------------- > package/ell/ell.hash | 2 +- > package/ell/ell.mk | 2 +- > 4 files changed, 32 insertions(+), 59 deletions(-) > create mode 100644 package/ell/0001-ell-ell.sym-add-missing-l_genl_family_set_unicast_ha.patch > delete mode 100644 package/ell/0001-ell-signal.h-use-standard-sigset_t-fixes-musl-compil.patch > > diff --git a/package/ell/0001-ell-ell.sym-add-missing-l_genl_family_set_unicast_ha.patch b/package/ell/0001-ell-ell.sym-add-missing-l_genl_family_set_unicast_ha.patch > new file mode 100644 > index 0000000000..e521a93f7a > --- /dev/null > +++ b/package/ell/0001-ell-ell.sym-add-missing-l_genl_family_set_unicast_ha.patch > @@ -0,0 +1,30 @@ > +From e68d797ffdfe768c1e4a356add5bb12c43f40a72 Mon Sep 17 00:00:00 2001 > +From: Peter Seiderer <ps.report@gmx.net> > +Date: Fri, 9 Nov 2018 23:28:39 +0100 > +Subject: [PATCH] ell/ell.sym: add missing l_genl_family_set_unicast_handler > + > +Fixes iwd compile failure: > + > + src/netdev.o: In function `netdev_set_nl80211': > + netdev.c:(.text+0x6f04): undefined reference to `l_genl_family_set_unicast_handler' > + > +Signed-off-by: Peter Seiderer <ps.report@gmx.net> > +--- > + ell/ell.sym | 1 + > + 1 file changed, 1 insertion(+) > + > +diff --git a/ell/ell.sym b/ell/ell.sym > +index 614bc93..cdd2c21 100644 > +--- a/ell/ell.sym > ++++ b/ell/ell.sym > +@@ -257,6 +257,7 @@ global: > + l_genl_family_new; > + l_genl_family_ref; > + l_genl_family_unref; > ++ l_genl_family_set_unicast_handler; > + l_genl_family_set_watches; > + l_genl_family_get_version; > + l_genl_family_get_genl; > +-- > +2.19.1 > + > diff --git a/package/ell/0001-ell-signal.h-use-standard-sigset_t-fixes-musl-compil.patch b/package/ell/0001-ell-signal.h-use-standard-sigset_t-fixes-musl-compil.patch > deleted file mode 100644 > index a1d252b42a..0000000000 > --- a/package/ell/0001-ell-signal.h-use-standard-sigset_t-fixes-musl-compil.patch > +++ /dev/null > @@ -1,57 +0,0 @@ > -From abff9db9a6e86e00613a420dd6a0ba3bc81e2b72 Mon Sep 17 00:00:00 2001 > -From: Peter Seiderer <ps.report@gmx.net> > -Date: Fri, 2 Nov 2018 12:58:57 +0100 > -Subject: [PATCH] ell/signal.h: use standard sigset_t, fixes musl compile > -MIME-Version: 1.0 > -Content-Type: text/plain; charset=UTF-8 > -Content-Transfer-Encoding: 8bit > - > -Use standard sigset_t (instead __sigset_t): > - > -- fixes musl compile > -- fies mismatch between header and implementation file > - > -Fixes: > - > - In file included from ell/main.c:35:0: > - ell/signal.h:39:40: error: unknown type name ?__sigset_t? > - struct l_signal *l_signal_create(const __sigset_t *mask, > - ^~~~~~~~~~ > - In file included from ell/signal.c:35:0: > - ell/signal.h:39:40: error: unknown type name ?__sigset_t? > - struct l_signal *l_signal_create(const __sigset_t *mask, > - ^~~~~~~~~~ > - ell/signal.c:153:29: error: conflicting types for ?l_signal_create? > - LIB_EXPORT struct l_signal *l_signal_create(const sigset_t *mask, > - ^~~~~~~~~~~~~~~ > - In file included from ell/signal.c:35:0: > - ell/signal.h:39:18: note: previous declaration of ?l_signal_create? was here > - struct l_signal *l_signal_create(const __sigset_t *mask, > - ^~~~~~~~~~~~~~~ > - > -Reverts upstream commit [1], superseeded in the next version by [2]. > - > -[1] https://git.kernel.org/pub/scm/libs/ell/ell.git/commit/?id=7af8e3ba0ed522897f5a87e6c8f2980f82ff5012 > -[2] https://git.kernel.org/pub/scm/libs/ell/ell.git/commit/?id=4a386a10d88ff52097a974167ab889b3fc2add70 > - > -Signed-off-by: Peter Seiderer <ps.report@gmx.net> > ---- > - ell/signal.h | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/ell/signal.h b/ell/signal.h > -index 0d4fdc8..98cf0fa 100644 > ---- a/ell/signal.h > -+++ b/ell/signal.h > -@@ -36,7 +36,7 @@ typedef void (*l_signal_notify_cb_t) (struct l_signal *signal, > - uint32_t signo, void *user_data); > - typedef void (*l_signal_destroy_cb_t) (void *user_data); > - > --struct l_signal *l_signal_create(const __sigset_t *mask, > -+struct l_signal *l_signal_create(const sigset_t *mask, > - l_signal_notify_cb_t callback, > - void *user_data, l_signal_destroy_cb_t destroy); > - void l_signal_remove(struct l_signal *signal); > --- > -2.19.1 > - > diff --git a/package/ell/ell.hash b/package/ell/ell.hash > index c6b23baec8..84827437ec 100644 > --- a/package/ell/ell.hash > +++ b/package/ell/ell.hash > @@ -1,5 +1,5 @@ > # Locally computed > -sha256 8e629347d49d30418e215ccf80f05eb6ff617f752396f93287ed723169aec006 ell-0.13.tar.gz > +sha256 1791d2e18f0089af0d58a3d2f76a2846c2d9fa59eb2848124a713ce380561b0e ell-0.14.tar.gz > > # License files > sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING > diff --git a/package/ell/ell.mk b/package/ell/ell.mk > index 8ea95a6d77..56d53be868 100644 > --- a/package/ell/ell.mk > +++ b/package/ell/ell.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -ELL_VERSION = 0.13 > +ELL_VERSION = 0.14 > ELL_SITE = https://git.kernel.org/pub/scm/libs/ell/ell.git > ELL_SITE_METHOD = git > ELL_LICENSE = LGPL-2.1+ ^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v3 1/2] ell: bump version to 0.14 2018-11-09 23:17 [Buildroot] [PATCH v3 1/2] ell: bump version to 0.14 Peter Seiderer 2018-11-09 23:17 ` [Buildroot] [PATCH v3 2/2] iwd: new package Peter Seiderer 2018-11-10 14:02 ` [Buildroot] [PATCH v3 1/2] ell: bump version to 0.14 Peter Seiderer @ 2018-11-14 10:50 ` Thomas Petazzoni 2 siblings, 0 replies; 5+ messages in thread From: Thomas Petazzoni @ 2018-11-14 10:50 UTC (permalink / raw) To: buildroot Hello, On Sat, 10 Nov 2018 00:17:24 +0100, Peter Seiderer wrote: > - remove superseeded patch 0001-ell-signal.h-use-standard-sigset_t-fixes-musl-compil.patch > - add patch for missing l_genl_family_set_unicast_handler symbol export > > Signed-off-by: Peter Seiderer <ps.report@gmx.net> > --- > Changes v2 -> v3: > - new patch (needed by iwd update to 0.11) > --- > ...missing-l_genl_family_set_unicast_ha.patch | 30 ++++++++++ > ...-standard-sigset_t-fixes-musl-compil.patch | 57 ------------------- > package/ell/ell.hash | 2 +- > package/ell/ell.mk | 2 +- > 4 files changed, 32 insertions(+), 59 deletions(-) > create mode 100644 package/ell/0001-ell-ell.sym-add-missing-l_genl_family_set_unicast_ha.patch > delete mode 100644 package/ell/0001-ell-signal.h-use-standard-sigset_t-fixes-musl-compil.patch Both applied to next. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-11-14 10:50 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2018-11-09 23:17 [Buildroot] [PATCH v3 1/2] ell: bump version to 0.14 Peter Seiderer 2018-11-09 23:17 ` [Buildroot] [PATCH v3 2/2] iwd: new package Peter Seiderer 2018-11-10 14:04 ` Peter Seiderer 2018-11-10 14:02 ` [Buildroot] [PATCH v3 1/2] ell: bump version to 0.14 Peter Seiderer 2018-11-14 10:50 ` Thomas Petazzoni
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox