summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorRadu Moisan <radu.moisan@intel.com>2013-02-08 22:43:19 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-11 14:46:11 +0000
commitde160bc792301b1ea930daf8ad6cbe1e2f9468ca (patch)
tree59a1d638eec236b2526928d8a2f8ce16e5ca4335 /meta/recipes-connectivity
parent7c8160ccbe17d6e10bd7a09b91843182a89b9055 (diff)
downloadpoky-de160bc792301b1ea930daf8ad6cbe1e2f9468ca.tar.gz
wpa-supplicant: Enabling with systemd
(From OE-Core rev: bd1e384017954e883f56379560afc2f9947ebbd6) Signed-off-by: Radu Moisan <radu.moisan@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.0.inc13
1 files changed, 10 insertions, 3 deletions
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.0.inc b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.0.inc
index 89910a0589..75e85ae646 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.0.inc
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.0.inc
@@ -9,6 +9,11 @@ LIC_FILES_CHKSUM = "file://../COPYING;md5=ab87f20cd7e8c0d0a6539b34d3791d0e \
9DEPENDS = "gnutls dbus libnl" 9DEPENDS = "gnutls dbus libnl"
10RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli" 10RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli"
11 11
12inherit systemd
13
14SYSTEMD_SERVICE_${PN} = "wpa_supplicant.service wpa_supplicant-nl80211@.service wpa_supplicant-wired@.service"
15SYSTEMD_AUTO_ENABLE = "disable"
16
12SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \ 17SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
13 file://defconfig-gnutls \ 18 file://defconfig-gnutls \
14 file://wpa-supplicant.sh \ 19 file://wpa-supplicant.sh \
@@ -21,7 +26,7 @@ S = "${WORKDIR}/wpa_supplicant-${PV}/wpa_supplicant"
21PACKAGES_prepend = "wpa-supplicant-passphrase wpa-supplicant-cli " 26PACKAGES_prepend = "wpa-supplicant-passphrase wpa-supplicant-cli "
22FILES_wpa-supplicant-passphrase = "${bindir}/wpa_passphrase" 27FILES_wpa-supplicant-passphrase = "${bindir}/wpa_passphrase"
23FILES_wpa-supplicant-cli = "${sbindir}/wpa_cli" 28FILES_wpa-supplicant-cli = "${sbindir}/wpa_cli"
24FILES_${PN} += "${datadir}/dbus-1/system-services/* ${systemd_unitdir}/system/*" 29FILES_${PN} += "${datadir}/dbus-1/system-services/*"
25CONFFILES_${PN} += "${sysconfdir}/wpa_supplicant.conf" 30CONFFILES_${PN} += "${sysconfdir}/wpa_supplicant.conf"
26 31
27do_configure () { 32do_configure () {
@@ -63,8 +68,10 @@ do_install () {
63 install -d ${D}/${datadir}/dbus-1/system-services 68 install -d ${D}/${datadir}/dbus-1/system-services
64 install -m 644 ${S}/dbus/*.service ${D}/${datadir}/dbus-1/system-services 69 install -m 644 ${S}/dbus/*.service ${D}/${datadir}/dbus-1/system-services
65 70
66 install -d ${D}/${systemd_unitdir}/system 71 if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then
67 install -m 644 ${S}/systemd/wpa_supplicant.service ${D}/${systemd_unitdir}/system 72 install -d ${D}/${systemd_unitdir}/system
73 install -m 644 ${S}/systemd/*.service ${D}/${systemd_unitdir}/system
74 fi
68 75
69 install -d ${D}/etc/default/volatiles 76 install -d ${D}/etc/default/volatiles
70 install -m 0644 ${WORKDIR}/99_wpa_supplicant ${D}/etc/default/volatiles 77 install -m 0644 ${WORKDIR}/99_wpa_supplicant ${D}/etc/default/volatiles