From 46cdb52d7ff1ac2207bd3f807a4479975674a018 Mon Sep 17 00:00:00 2001 From: Alex Kiernan Date: Tue, 12 Apr 2022 14:03:15 +0100 Subject: wpa-supplicant: Package dynamic modules If CONFIG_DYNAMIC_EAP_METHODS and some modules are set to `dyn` ensure these are packaged as part of the build. (From OE-Core rev: 6043e4332beea8073eb1148a59b66f0618c05e96) Signed-off-by: Alex Kiernan Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie --- .../wpa-supplicant/wpa-supplicant_2.10.bb | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'meta') diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb index 861855e485..e83aef70d5 100644 --- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb +++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb @@ -98,14 +98,34 @@ pkg_postinst:${PN} () { } PACKAGE_BEFORE_PN += "${PN}-passphrase ${PN}-cli" +PACKAGES += "${PN}-plugins" +ALLOW_EMPTY:${PN}-plugins = "1" + +PACKAGES_DYNAMIC += "^${PN}-plugin-.*$" +NOAUTOPACKAGEDEBUG = "1" FILES:${PN}-passphrase = "${bindir}/wpa_passphrase" FILES:${PN}-cli = "${sbindir}/wpa_cli" FILES:${PN} += "${datadir}/dbus-1/system-services/* ${systemd_system_unitdir}/*" +FILES:${PN}-dbg += "${sbindir}/.debug" CONFFILES:${PN} += "${sysconfdir}/wpa_supplicant.conf" -RRECOMMENDS:${PN} = "${PN}-passphrase ${PN}-cli" +RRECOMMENDS:${PN} = "${PN}-passphrase ${PN}-cli ${PN}-plugins" SYSTEMD_SERVICE:${PN} = "wpa_supplicant.service" SYSTEMD_AUTO_ENABLE = "disable" + +python split_wpa_supplicant_libs () { + libdir = d.expand('${libdir}/wpa_supplicant') + dbglibdir = os.path.join(libdir, '.debug') + + split_packages = do_split_packages(d, libdir, r'^(.*)\.so', '${PN}-plugin-%s', 'wpa_supplicant %s plugin', prepend=True) + split_dbg_packages = do_split_packages(d, dbglibdir, r'^(.*)\.so', '${PN}-plugin-%s-dbg', 'wpa_supplicant %s plugin - Debugging files', prepend=True, extra_depends='${PN}-dbg') + + if split_packages: + pn = d.getVar('PN') + d.setVar('RRECOMMENDS:' + pn + '-plugins', ' '.join(split_packages)) + d.appendVar('RRECOMMENDS:' + pn + '-dbg', ' ' + ' '.join(split_dbg_packages)) +} +PACKAGESPLITFUNCS:prepend = "split_wpa_supplicant_libs " -- cgit v1.2.3-54-g00ecf