summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2015-03-27 19:14:24 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-31 22:23:18 +0100
commit3c284cfd052367adde54f9235f3dc97cd8647dd0 (patch)
tree31871d83d2c4b34f7cca2020794989f88b64a898 /meta/recipes-connectivity
parenta879c89b838711578b22248662ffd78d648a600f (diff)
downloadpoky-3c284cfd052367adde54f9235f3dc97cd8647dd0.tar.gz
wpa-supplicant: Make SystemD D-Bus config conditional
The SystemD D-Bus configuration should only to be installed when SystemD support is enabled. (From OE-Core rev: e54f2569f4fb880387edc6a99d790b765ae33080) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc5
1 files 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 () {
86 cd ${D}${sysconfdir}/network/ && \ 86 cd ${D}${sysconfdir}/network/ && \
87 ln -sf ../if-pre-up.d/wpa-supplicant if-post-down.d/wpa-supplicant 87 ln -sf ../if-pre-up.d/wpa-supplicant if-post-down.d/wpa-supplicant
88 88
89 install -d ${D}/${sysconfdir}/dbus-1/system.d
90 install -m 644 ${S}/wpa_supplicant/dbus/dbus-wpa_supplicant.conf ${D}/${sysconfdir}/dbus-1/system.d
91 install -d ${D}/${datadir}/dbus-1/system-services 89 install -d ${D}/${datadir}/dbus-1/system-services
92 install -m 644 ${S}/wpa_supplicant/dbus/*.service ${D}/${datadir}/dbus-1/system-services 90 install -m 644 ${S}/wpa_supplicant/dbus/*.service ${D}/${datadir}/dbus-1/system-services
93 91
94 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then 92 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
93 install -d ${D}/${sysconfdir}/dbus-1/system.d
94 install -m 644 ${S}/wpa_supplicant/dbus/dbus-wpa_supplicant.conf ${D}/${sysconfdir}/dbus-1/system.d
95
95 install -d ${D}/${systemd_unitdir}/system 96 install -d ${D}/${systemd_unitdir}/system
96 install -m 644 ${S}/wpa_supplicant/systemd/*.service ${D}/${systemd_unitdir}/system 97 install -m 644 ${S}/wpa_supplicant/systemd/*.service ${D}/${systemd_unitdir}/system
97 fi 98 fi