[meta-oe,3/8] wpa-supplicant: Use PACKAGE_BEFORE_PN/${PN}

Message ID 20220412130315.25917-3-alexk@zuma.ai
State New
Headers show
Series [meta-oe,1/8] wpa-supplicant: Reorder/group following style guide | expand

Commit Message

Alex Kiernan April 12, 2022, 1:03 p.m. UTC
Use PACKAGE_BEFORE_PN for packages which need to capture files early,
switch to idiomatic ${PN} for additional packages.

Signed-off-by: Alex Kiernan <alexk@zuma.ai>
---
 .../wpa-supplicant/wpa-supplicant_2.10.bb                 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Patch

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 6c378d532d39..dabb3ccbefd1 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb
@@ -96,15 +96,15 @@  pkg_postinst:${PN} () {
 	fi
 }
 
-PACKAGES:prepend = "wpa-supplicant-passphrase wpa-supplicant-cli "
+PACKAGE_BEFORE_PN += "${PN}-passphrase ${PN}-cli"
 
-FILES:wpa-supplicant-passphrase = "${bindir}/wpa_passphrase"
-FILES:wpa-supplicant-cli = "${sbindir}/wpa_cli"
+FILES:${PN}-passphrase = "${bindir}/wpa_passphrase"
+FILES:${PN}-cli = "${sbindir}/wpa_cli"
 FILES:${PN} += "${datadir}/dbus-1/system-services/* ${systemd_system_unitdir}/*"
 
 CONFFILES:${PN} += "${sysconfdir}/wpa_supplicant.conf"
 
-RRECOMMENDS:${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli"
+RRECOMMENDS:${PN} = "${PN}-passphrase ${PN}-cli"
 
 SYSTEMD_SERVICE:${PN} = "wpa_supplicant.service"
 SYSTEMD_AUTO_ENABLE = "disable"