]> code.ossystems Code Review - openembedded-core.git/commitdiff
wpa-supplicant: Make SystemD D-Bus config conditional
authorOtavio Salvador <otavio@ossystems.com.br>
Fri, 27 Mar 2015 22:14:24 +0000 (19:14 -0300)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 31 Mar 2015 21:21:45 +0000 (22:21 +0100)
The SystemD D-Bus configuration should only to be installed when
SystemD support is enabled.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc

index 6f0de3cab883a8925a6da2c3eb82b1e1144c1178..f95e91c999b81460411da90dbeb2f0afc0426065 100644 (file)
@@ -86,12 +86,13 @@ 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