From e54f2569f4fb880387edc6a99d790b765ae33080 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 27 Mar 2015 19:14:24 -0300 Subject: wpa-supplicant: Make SystemD D-Bus config conditional The SystemD D-Bus configuration should only to be installed when SystemD support is enabled. Signed-off-by: Otavio Salvador Signed-off-by: Richard Purdie --- meta/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc index 6f0de3cab8..f95e91c999 100644 --- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc +++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc @@ -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 -- cgit 1.2.3-korg