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@ossystems.com.br>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

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 b7c7033d6352cfbf2fbf9bedee939c95456894ed..ebae23922eafe518a0961a8ddd2cce1248c2c853 100644 (file)
--- 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