wpa-supplicant: Include wpa_supplicant.service file in package for dbus to work

The dbus service files include a reference to wpa_supplicant.service, but if it
does not exist the dbus-daemon warns:

[system] Activating via systemd: service name='fi.w1.wpa_supplicant1' unit='wpa_supplicant.service'
[system] Activation via systemd failed for unit 'wpa_supplicant.service': Unit wpa_supplicant.service failed to load: No such file or directory.  See system logs and 'systemctl status wpa_supplicant.service' for details.

If this happens, wpa_supplicant is not run automatically.

(From OE-Core rev: 600c07c4391dc44638e9c920c3c402b6588d1259)

Signed-off-by: Stan Hu <stanhu@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0.inc b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0.inc
index ff5cddc..0645193 100644 (file)
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0.inc
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0.inc
@@ -21,7 +21,7 @@ S = "${WORKDIR}/wpa_supplicant-${PV}/wpa_supplicant"
 PACKAGES_prepend = "wpa-supplicant-passphrase wpa-supplicant-cli "
 FILES_wpa-supplicant-passphrase = "${bindir}/wpa_passphrase"
 FILES_wpa-supplicant-cli = "${sbindir}/wpa_cli"
-FILES_${PN} += "${datadir}/dbus-1/system-services/*"
+FILES_${PN} += "${datadir}/dbus-1/system-services/* ${systemd_unitdir}/system/*"
 CONFFILES_${PN} += "${sysconfdir}/wpa_supplicant.conf"
 
 do_configure () {
@@ -63,6 +63,9 @@ do_install () {
        install -d ${D}/${datadir}/dbus-1/system-services
        install -m 644 ${S}/dbus/*.service ${D}/${datadir}/dbus-1/system-services
 
+       install -d ${D}/${systemd_unitdir}/system
+       install -m 644 ${S}/systemd/wpa_supplicant.service ${D}/${systemd_unitdir}/system
+
        install -d ${D}/etc/default/volatiles
        install -m 0644 ${WORKDIR}/99_wpa_supplicant ${D}/etc/default/volatiles
 }