From 93d67b30793ef5d22647d9f80656ba3449083ea5 Mon Sep 17 00:00:00 2001 From: Pierre-Jean Texier Date: Fri, 13 Mar 2020 19:57:50 +0100 Subject: iwd: upgrade 1.4 -> 1.5 Remove patch already in version Fixes: ver 1.5: Fix issue with handling missing NEW_WIPHY events. Fix issue with interface creation and NEW_WIPHY events. Fix issue with handling LastConnectedTime property change. Fix issue with PEAPv0 interoperability with Windows. Signed-off-by: Pierre-Jean Texier Signed-off-by: Khem Raj --- .../iwd/0001-build-Support-missing-rawmemchr.patch | 62 ---------------------- meta-oe/recipes-connectivity/iwd/iwd_1.4.bb | 58 -------------------- meta-oe/recipes-connectivity/iwd/iwd_1.5.bb | 56 +++++++++++++++++++ 3 files changed, 56 insertions(+), 120 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/iwd/iwd/0001-build-Support-missing-rawmemchr.patch delete mode 100644 meta-oe/recipes-connectivity/iwd/iwd_1.4.bb create mode 100644 meta-oe/recipes-connectivity/iwd/iwd_1.5.bb (limited to 'meta-oe/recipes-connectivity/iwd') diff --git a/meta-oe/recipes-connectivity/iwd/iwd/0001-build-Support-missing-rawmemchr.patch b/meta-oe/recipes-connectivity/iwd/iwd/0001-build-Support-missing-rawmemchr.patch deleted file mode 100644 index 733f5fea1..000000000 --- a/meta-oe/recipes-connectivity/iwd/iwd/0001-build-Support-missing-rawmemchr.patch +++ /dev/null @@ -1,62 +0,0 @@ -From fcdddf2b726439e049992878f90da607414a1a47 Mon Sep 17 00:00:00 2001 -From: Denis Kenzior -Date: Mon, 3 Feb 2020 11:54:28 -0600 -Subject: [PATCH] build: Support missing rawmemchr - -rawmemchr is a GNU extension in glibc that does not exist in musl. - -Upstream-status: Backport of https://git.kernel.org/pub/scm/network/wireless/iwd.git/commit/?id=fcdddf2b726439e049992878f90da607414a1a47 - -Signed-off-by: Robert Joslyn - ---- - configure.ac | 1 + - src/missing.h | 10 ++++++++++ - src/wiphy.c | 1 + - 3 files changed, 12 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 5ae1401cae17..2d373a47ba68 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -128,6 +128,7 @@ AC_DEFINE_UNQUOTED(WIRED_STORAGEDIR, "${wired_storagedir}", - [Directory for Ethernet daemon storage files]) - - AC_CHECK_FUNCS(explicit_bzero) -+AC_CHECK_FUNCS(rawmemchr) - - AC_CHECK_HEADERS(linux/types.h linux/if_alg.h) - -diff --git a/src/missing.h b/src/missing.h -index 2bb210ae3c81..2cc80aee5d38 100644 ---- a/src/missing.h -+++ b/src/missing.h -@@ -27,3 +27,13 @@ static inline void explicit_bzero(void *s, size_t n) - __asm__ __volatile__ ("" : : "r"(s) : "memory"); - } - #endif -+ -+#ifndef HAVE_RAWMEMCHR -+static inline void *rawmemchr(const void *s, int c) -+{ -+_Pragma("GCC diagnostic push") -+_Pragma("GCC diagnostic ignored \"-Wstringop-overflow=\"") -+ return memchr(s, c, (size_t) -1); -+_Pragma("GCC diagnostic pop") -+} -+#endif -diff --git a/src/wiphy.c b/src/wiphy.c -index 1da479db2dab..511bb27f52b8 100644 ---- a/src/wiphy.c -+++ b/src/wiphy.c -@@ -37,6 +37,7 @@ - - #include "linux/nl80211.h" - -+#include "src/missing.h" - #include "src/iwd.h" - #include "src/module.h" - #include "src/ie.h" --- -2.21.0 - diff --git a/meta-oe/recipes-connectivity/iwd/iwd_1.4.bb b/meta-oe/recipes-connectivity/iwd/iwd_1.4.bb deleted file mode 100644 index f758781e3..000000000 --- a/meta-oe/recipes-connectivity/iwd/iwd_1.4.bb +++ /dev/null @@ -1,58 +0,0 @@ -SUMMARY = "Wireless daemon for Linux" -HOMEPAGE = "https://iwd.wiki.kernel.org/" -LICENSE = "LGPL-2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" - -DEPENDS = "ell" - -SRC_URI = " \ - git://git.kernel.org/pub/scm/network/wireless/iwd.git \ - file://0001-Makefile.am-Avoid-redirection-of-input-and-output-fi.patch \ - file://0001-build-Support-missing-rawmemchr.patch \ -" -SRCREV = "860fa4697f349da7791ecf22ca76f9ac0e5de261" -S = "${WORKDIR}/git" - -inherit autotools manpages pkgconfig python3native systemd - -PACKAGECONFIG ??= " \ - client \ - monitor \ - ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ -" -PACKAGECONFIG[client] = "--enable-client,--disable-client,readline" -PACKAGECONFIG[monitor] = "--enable-monitor,--disable-monitor" -PACKAGECONFIG[manpages] = "--enable-manual-pages,--disable-manual-pages,python3-docutils-native" -PACKAGECONFIG[wired] = "--enable-wired,--disable-wired" -PACKAGECONFIG[ofono] = "--enable-ofono,--disable-ofono" -PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--disable-systemd-service,systemd" - -EXTRA_OECONF = "--enable-external-ell" - -SYSTEMD_SERVICE_${PN} = " \ - iwd.service \ - ${@bb.utils.contains('PACKAGECONFIG', 'wired', 'ead.service', '', d)} \ -" - -do_configure_prepend() { - install -d ${S}/build-aux -} - -do_install_append() { - # If client and monitor are disabled, bindir is empty, causing a QA error - rmdir --ignore-fail-on-non-empty ${D}/${bindir} -} - -FILES_${PN} += " \ - ${datadir}/dbus-1 \ - ${nonarch_libdir}/modules-load.d \ - ${systemd_unitdir}/network \ -" - -RDEPENDS_${PN} = "dbus" - -RRECOMMENDS_${PN} = "\ - kernel-module-pkcs7-message \ - kernel-module-pkcs8-key-parser \ - kernel-module-x509-key-parser \ -" diff --git a/meta-oe/recipes-connectivity/iwd/iwd_1.5.bb b/meta-oe/recipes-connectivity/iwd/iwd_1.5.bb new file mode 100644 index 000000000..4d4c69906 --- /dev/null +++ b/meta-oe/recipes-connectivity/iwd/iwd_1.5.bb @@ -0,0 +1,56 @@ +SUMMARY = "Wireless daemon for Linux" +HOMEPAGE = "https://iwd.wiki.kernel.org/" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" + +DEPENDS = "ell" + +SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git \ + file://0001-Makefile.am-Avoid-redirection-of-input-and-output-fi.patch \ + " +SRCREV = "1ee7b985aaa294447d073bfe1242744784278a8e" +S = "${WORKDIR}/git" + +inherit autotools manpages pkgconfig python3native systemd + +PACKAGECONFIG ??= " \ + client \ + monitor \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ +" +PACKAGECONFIG[client] = "--enable-client,--disable-client,readline" +PACKAGECONFIG[monitor] = "--enable-monitor,--disable-monitor" +PACKAGECONFIG[manpages] = "--enable-manual-pages,--disable-manual-pages,python3-docutils-native" +PACKAGECONFIG[wired] = "--enable-wired,--disable-wired" +PACKAGECONFIG[ofono] = "--enable-ofono,--disable-ofono" +PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--disable-systemd-service,systemd" + +EXTRA_OECONF = "--enable-external-ell" + +SYSTEMD_SERVICE_${PN} = " \ + iwd.service \ + ${@bb.utils.contains('PACKAGECONFIG', 'wired', 'ead.service', '', d)} \ +" + +do_configure_prepend() { + install -d ${S}/build-aux +} + +do_install_append() { + # If client and monitor are disabled, bindir is empty, causing a QA error + rmdir --ignore-fail-on-non-empty ${D}/${bindir} +} + +FILES_${PN} += " \ + ${datadir}/dbus-1 \ + ${nonarch_libdir}/modules-load.d \ + ${systemd_unitdir}/network \ +" + +RDEPENDS_${PN} = "dbus" + +RRECOMMENDS_${PN} = "\ + kernel-module-pkcs7-message \ + kernel-module-pkcs8-key-parser \ + kernel-module-x509-key-parser \ +" -- cgit v1.2.3-54-g00ecf