From 6de735114a69447c51935d801dc6012fbf369308 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Mon, 30 Mar 2026 23:38:29 +1300 Subject: iwd: upgrade 3.11 -> 3.12 Changelog: =========== - Fix issue with handling expiration of PMKSA. - Fix issue with handling uninitialized buffer and PMKID. - Fix issue with checking for PKCS#8 key parser in unit tests. - Fix issue with using -std=c23 compiler setting. Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj (cherry picked from commit 7c5ec1fa02b125d9285d0e518ed2e62073b30b73) Signed-off-by: Ankur Tyagi Signed-off-by: Anuj Mittal --- meta-oe/recipes-connectivity/iwd/iwd_3.11.bb | 62 ---------------------------- meta-oe/recipes-connectivity/iwd/iwd_3.12.bb | 62 ++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 62 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/iwd/iwd_3.11.bb create mode 100644 meta-oe/recipes-connectivity/iwd/iwd_3.12.bb diff --git a/meta-oe/recipes-connectivity/iwd/iwd_3.11.bb b/meta-oe/recipes-connectivity/iwd/iwd_3.11.bb deleted file mode 100644 index c4956fb22c..0000000000 --- a/meta-oe/recipes-connectivity/iwd/iwd_3.11.bb +++ /dev/null @@ -1,62 +0,0 @@ -SUMMARY = "Wireless daemon for Linux" -HOMEPAGE = "https://iwd.wiki.kernel.org/" -LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" - -DEPENDS = "dbus" - -SRC_URI = "https://www.kernel.org/pub/linux/network/wireless/${BP}.tar.xz \ - file://0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch \ - file://iwd \ - " -SRC_URI[sha256sum] = "85730e79de05978e26e44b958fd11e2ebb45424ca181f8db7a8daf25fc2226ea" - -inherit autotools manpages pkgconfig python3native systemd update-rc.d - -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" - -INITSCRIPT_NAME = "iwd" -INITSCRIPT_PARAMS = "start 04 5 2 3 . stop 23 0 1 6 ." - -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} - - if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${UNPACKDIR}/iwd ${D}${sysconfdir}/init.d/iwd - fi -} - -FILES:${PN} += " \ - ${datadir}/dbus-1 \ - ${nonarch_libdir}/modules-load.d \ - ${systemd_unitdir}/network \ -" - -RDEPENDS:${PN} = "${VIRTUAL-RUNTIME_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_3.12.bb b/meta-oe/recipes-connectivity/iwd/iwd_3.12.bb new file mode 100644 index 0000000000..a53137537e --- /dev/null +++ b/meta-oe/recipes-connectivity/iwd/iwd_3.12.bb @@ -0,0 +1,62 @@ +SUMMARY = "Wireless daemon for Linux" +HOMEPAGE = "https://iwd.wiki.kernel.org/" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" + +DEPENDS = "dbus" + +SRC_URI = "https://www.kernel.org/pub/linux/network/wireless/${BP}.tar.xz \ + file://0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch \ + file://iwd \ + " +SRC_URI[sha256sum] = "d89a5e45c7180170e19be828f9e944a768c593758094fc57a358d0e7c4cb1a49" + +inherit autotools manpages pkgconfig python3native systemd update-rc.d + +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" + +INITSCRIPT_NAME = "iwd" +INITSCRIPT_PARAMS = "start 04 5 2 3 . stop 23 0 1 6 ." + +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} + + if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${UNPACKDIR}/iwd ${D}${sysconfdir}/init.d/iwd + fi +} + +FILES:${PN} += " \ + ${datadir}/dbus-1 \ + ${nonarch_libdir}/modules-load.d \ + ${systemd_unitdir}/network \ +" + +RDEPENDS:${PN} = "${VIRTUAL-RUNTIME_dbus}" + +RRECOMMENDS:${PN} = "\ + kernel-module-pkcs7-message \ + kernel-module-pkcs8-key-parser \ + kernel-module-x509-key-parser \ +" -- cgit v1.2.3-54-g00ecf