aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/wpa-supplicant
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:44:32 +0000
commitbd1e384017954e883f56379560afc2f9947ebbd6 (patch)
treeeebec332cd4fb4260a531535f1facf5bbfcf0bfd /meta/recipes-connectivity/wpa-supplicant
parent352b3e3663fc4ccab2d8240176f4b085db726e82 (diff)
downloadopenembedded-core-contrib-bd1e384017954e883f56379560afc2f9947ebbd6.tar.gz
openembedded-core-contrib-bd1e384017954e883f56379560afc2f9947ebbd6.tar.bz2
openembedded-core-contrib-bd1e384017954e883f56379560afc2f9947ebbd6.zip
wpa-supplicant: Enabling with systemd
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/wpa-supplicant')
-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 \
DEPENDS = "gnutls dbus libnl"
RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli"
+inherit systemd
+
+SYSTEMD_SERVICE_${PN} = "wpa_supplicant.service wpa_supplicant-nl80211@.service wpa_supplicant-wired@.service"
+SYSTEMD_AUTO_ENABLE = "disable"
+
SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \
file://defconfig-gnutls \
file://wpa-supplicant.sh \
@@ -21,7 +26,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/* ${systemd_unitdir}/system/*"
+FILES_${PN} += "${datadir}/dbus-1/system-services/*"
CONFFILES_${PN} += "${sysconfdir}/wpa_supplicant.conf"
do_configure () {
@@ -63,8 +68,10 @@ 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
+ if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+ install -d ${D}/${systemd_unitdir}/system
+ install -m 644 ${S}/systemd/*.service ${D}/${systemd_unitdir}/system
+ fi
install -d ${D}/etc/default/volatiles
install -m 0644 ${WORKDIR}/99_wpa_supplicant ${D}/etc/default/volatiles