summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/wpa-supplicant
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2015-06-24 11:43:33 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-24 14:04:14 +0100
commit18e902b2dc17746af453869bcc1fba4dbae7c94f (patch)
tree2582749e23b5ad7760ea53d8c470338722771250 /meta/recipes-connectivity/wpa-supplicant
parentef1a66bff821b7a4e844af74fdd3b6fcc3173bd0 (diff)
downloadpoky-18e902b2dc17746af453869bcc1fba4dbae7c94f.tar.gz
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. (From OE-Core rev: 2587b83faabdc8858e8746201805369ed8d53ba8) 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>
Diffstat (limited to 'meta/recipes-connectivity/wpa-supplicant')
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.4.bb5
1 files 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 b7c7033d63..ebae23922e 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 () {
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
89 install -d ${D}/${datadir}/dbus-1/system-services 91 install -d ${D}/${datadir}/dbus-1/system-services
90 install -m 644 ${S}/wpa_supplicant/dbus/*.service ${D}/${datadir}/dbus-1/system-services 92 install -m 644 ${S}/wpa_supplicant/dbus/*.service ${D}/${datadir}/dbus-1/system-services
91 93
92 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then 94 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
96 install -d ${D}/${systemd_unitdir}/system 95 install -d ${D}/${systemd_unitdir}/system
97 install -m 644 ${S}/wpa_supplicant/systemd/*.service ${D}/${systemd_unitdir}/system 96 install -m 644 ${S}/wpa_supplicant/systemd/*.service ${D}/${systemd_unitdir}/system
98 fi 97 fi