[oe-commits] Otavio Salvador : wpa-supplicant: Revert " Make SystemD D-Bus config conditional"

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 2587b83faabdc8858e8746201805369ed8d53ba8
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=2587b83faabdc8858e8746201805369ed8d53ba8

Author: Otavio Salvador <otavio at ossystems.com.br>
Date:   Wed Jun 24 11:43:33 2015 +0100

wpa-supplicant: Revert "Make SystemD D-Bus config conditional"

The D-Bus config is not systemd-specific. It is required for the D-Bus
communication to be operational.

This reverts commit e658ee16dc026b96f67a4c9666d3eb7bf7027de3.

Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
Signed-off-by: Ross Burton <ross.burton at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.4.bb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.4.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.4.bb
index b7c7033..ebae239 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.4.bb
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.4.bb
@@ -86,13 +86,12 @@ do_install () {
 	cd ${D}${sysconfdir}/network/ && \
 	ln -sf ../if-pre-up.d/wpa-supplicant if-post-down.d/wpa-supplicant
 
+	install -d ${D}/${sysconfdir}/dbus-1/system.d
+	install -m 644 ${S}/wpa_supplicant/dbus/dbus-wpa_supplicant.conf ${D}/${sysconfdir}/dbus-1/system.d
 	install -d ${D}/${datadir}/dbus-1/system-services
 	install -m 644 ${S}/wpa_supplicant/dbus/*.service ${D}/${datadir}/dbus-1/system-services
 
 	if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
-		install -d ${D}/${sysconfdir}/dbus-1/system.d
-		install -m 644 ${S}/wpa_supplicant/dbus/dbus-wpa_supplicant.conf ${D}/${sysconfdir}/dbus-1/system.d
-
 		install -d ${D}/${systemd_unitdir}/system
 		install -m 644 ${S}/wpa_supplicant/systemd/*.service ${D}/${systemd_unitdir}/system
 	fi