From 70a6cce8d8b15fcad77b35a551e10e7390ad7a6c Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Sun, 28 Feb 2021 22:31:00 +0800 Subject: iwd: upgrade 1.11 -> 1.12 0001-crypto-Update-l_pkcs5_pbkdf2-call-after-rename.patch Removed since this is included in 1.12. Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ...o-Update-l_pkcs5_pbkdf2-call-after-rename.patch | 31 ------------ meta-oe/recipes-connectivity/iwd/iwd_1.11.bb | 56 ---------------------- meta-oe/recipes-connectivity/iwd/iwd_1.12.bb | 55 +++++++++++++++++++++ 3 files changed, 55 insertions(+), 87 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/iwd/iwd/0001-crypto-Update-l_pkcs5_pbkdf2-call-after-rename.patch delete mode 100644 meta-oe/recipes-connectivity/iwd/iwd_1.11.bb create mode 100644 meta-oe/recipes-connectivity/iwd/iwd_1.12.bb diff --git a/meta-oe/recipes-connectivity/iwd/iwd/0001-crypto-Update-l_pkcs5_pbkdf2-call-after-rename.patch b/meta-oe/recipes-connectivity/iwd/iwd/0001-crypto-Update-l_pkcs5_pbkdf2-call-after-rename.patch deleted file mode 100644 index ab55b48b75..0000000000 --- a/meta-oe/recipes-connectivity/iwd/iwd/0001-crypto-Update-l_pkcs5_pbkdf2-call-after-rename.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 9389f472bc724abb6c6a8db696efb132215783cc Mon Sep 17 00:00:00 2001 -From: Andrew Zaborowski -Date: Thu, 24 Dec 2020 00:22:15 +0100 -Subject: [PATCH] crypto: Update l_pkcs5_pbkdf2 call after rename - ---- -Upstream-Status: Backport [https://git.kernel.org/pub/scm/network/wireless/iwd.git/commit/?id=9ef3d51f8724c9b9f9fd4d4fffcc730f4bb1c806] -Signed-off-by: Khem Raj - - src/crypto.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/crypto.c b/src/crypto.c -index f5f8e24d..563f17ce 100644 ---- a/src/crypto.c -+++ b/src/crypto.c -@@ -552,8 +552,9 @@ int crypto_psk_from_passphrase(const char *passphrase, - if (ssid_len == 0 || ssid_len > 32) - return -ERANGE; - -- result = l_pkcs5_pbkdf2(L_CHECKSUM_SHA1, passphrase, ssid, ssid_len, -- 4096, psk, sizeof(psk)); -+ result = l_cert_pkcs5_pbkdf2(L_CHECKSUM_SHA1, passphrase, -+ ssid, ssid_len, 4096, -+ psk, sizeof(psk)); - if (!result) - return -ENOKEY; - --- -2.30.0 - diff --git a/meta-oe/recipes-connectivity/iwd/iwd_1.11.bb b/meta-oe/recipes-connectivity/iwd/iwd_1.11.bb deleted file mode 100644 index 2205b72fff..0000000000 --- a/meta-oe/recipes-connectivity/iwd/iwd_1.11.bb +++ /dev/null @@ -1,56 +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-crypto-Update-l_pkcs5_pbkdf2-call-after-rename.patch \ - " -SRCREV = "355c2df97e1adfdaee4a67c1705bd76202384687" -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.12.bb b/meta-oe/recipes-connectivity/iwd/iwd_1.12.bb new file mode 100644 index 0000000000..ccdc65ac6c --- /dev/null +++ b/meta-oe/recipes-connectivity/iwd/iwd_1.12.bb @@ -0,0 +1,55 @@ +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 \ + " +SRCREV = "bde3e0f6e3364e9c884b6b93a944d8138345b8e5" +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 1.2.3-korg