summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2013-01-08 19:37:03 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-09 15:05:25 +0000
commit278a3c58acc54af4087da56f4aca9e679d4047e6 (patch)
tree1eea2b804089b0f882df5297251a4000356337ea
parent036e8fc414e8a4aab245be64ff0aefdc54cae0c3 (diff)
downloadpoky-278a3c58acc54af4087da56f4aca9e679d4047e6.tar.gz
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>
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0.inc5
1 files changed, 4 insertions, 1 deletions
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 ff5cddcd06..0645193803 100644
--- 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"
21PACKAGES_prepend = "wpa-supplicant-passphrase wpa-supplicant-cli " 21PACKAGES_prepend = "wpa-supplicant-passphrase wpa-supplicant-cli "
22FILES_wpa-supplicant-passphrase = "${bindir}/wpa_passphrase" 22FILES_wpa-supplicant-passphrase = "${bindir}/wpa_passphrase"
23FILES_wpa-supplicant-cli = "${sbindir}/wpa_cli" 23FILES_wpa-supplicant-cli = "${sbindir}/wpa_cli"
24FILES_${PN} += "${datadir}/dbus-1/system-services/*" 24FILES_${PN} += "${datadir}/dbus-1/system-services/* ${systemd_unitdir}/system/*"
25CONFFILES_${PN} += "${sysconfdir}/wpa_supplicant.conf" 25CONFFILES_${PN} += "${sysconfdir}/wpa_supplicant.conf"
26 26
27do_configure () { 27do_configure () {
@@ -63,6 +63,9 @@ do_install () {
63 install -d ${D}/${datadir}/dbus-1/system-services 63 install -d ${D}/${datadir}/dbus-1/system-services
64 install -m 644 ${S}/dbus/*.service ${D}/${datadir}/dbus-1/system-services 64 install -m 644 ${S}/dbus/*.service ${D}/${datadir}/dbus-1/system-services
65 65
66 install -d ${D}/${systemd_unitdir}/system
67 install -m 644 ${S}/systemd/wpa_supplicant.service ${D}/${systemd_unitdir}/system
68
66 install -d ${D}/etc/default/volatiles 69 install -d ${D}/etc/default/volatiles
67 install -m 0644 ${WORKDIR}/99_wpa_supplicant ${D}/etc/default/volatiles 70 install -m 0644 ${WORKDIR}/99_wpa_supplicant ${D}/etc/default/volatiles
68} 71}