diff options
author | Radu Moisan <radu.moisan@intel.com> | 2013-02-08 22:43:19 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-11 14:46:11 +0000 |
commit | de160bc792301b1ea930daf8ad6cbe1e2f9468ca (patch) | |
tree | 59a1d638eec236b2526928d8a2f8ce16e5ca4335 /meta/recipes-connectivity/wpa-supplicant | |
parent | 7c8160ccbe17d6e10bd7a09b91843182a89b9055 (diff) | |
download | openembedded-core-contrib-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/wpa-supplicant')
-rw-r--r-- | meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.0.inc | 13 |
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 |