summaryrefslogtreecommitdiffstats
path: root/meta
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:03:25 +0100
commit2587b83faabdc8858e8746201805369ed8d53ba8 (patch)
tree135aa4ea3a07da04c285e3f8c1dca7f8193d1f98 /meta
parent8c73bb7949656d91f138c087b9d261cdce90a94b (diff)
downloadopenembedded-core-2587b83faabdc8858e8746201805369ed8d53ba8.tar.gz
openembedded-core-2587b83faabdc8858e8746201805369ed8d53ba8.tar.bz2
openembedded-core-2587b83faabdc8858e8746201805369ed8d53ba8.zip
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>
Diffstat (limited to 'meta')
-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 () {
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