From: Radu Moisan <[email protected]>
Signed-off-by: Radu Moisan <[email protected]>
Signed-off-by: Ross Burton <[email protected]>
---
.../wpa-supplicant/wpa-supplicant-2.0.inc | 13 ++++++++++---
1 file 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 89910a0..75e85ae 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
[email protected] [email protected]"
+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
--
1.7.10.4
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
