summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Bonn <jonas@norrbonn.se>2019-01-29 08:24:40 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-31 23:23:27 +0000
commitfcb418e723778bdd42af9a6ef8c37f75e446e9b1 (patch)
tree0fdcaf1b7895a8fa2f75c0b650eeafba33da2b5b
parent635fbf88e2572183b1eedc6ac9bf2422a4d79e1c (diff)
downloadpoky-fcb418e723778bdd42af9a6ef8c37f75e446e9b1.tar.gz
dbus: volatiles are only needed by sysvinit configuration
(From OE-Core rev: 1b45725e7c4aeb4da54a71408c30097ea704ee67) Signed-off-by: Jonas Bonn <jonas@norrbonn.se> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/dbus/dbus_1.12.10.bb7
1 files changed, 3 insertions, 4 deletions
diff --git a/meta/recipes-core/dbus/dbus_1.12.10.bb b/meta/recipes-core/dbus/dbus_1.12.10.bb
index d71f7f7042..d3301278b0 100644
--- a/meta/recipes-core/dbus/dbus_1.12.10.bb
+++ b/meta/recipes-core/dbus/dbus_1.12.10.bb
@@ -120,6 +120,9 @@ do_install() {
120 install -d ${D}${sysconfdir}/init.d 120 install -d ${D}${sysconfdir}/init.d
121 sed 's:@bindir@:${bindir}:' < ${WORKDIR}/dbus-1.init >${WORKDIR}/dbus-1.init.sh 121 sed 's:@bindir@:${bindir}:' < ${WORKDIR}/dbus-1.init >${WORKDIR}/dbus-1.init.sh
122 install -m 0755 ${WORKDIR}/dbus-1.init.sh ${D}${sysconfdir}/init.d/dbus-1 122 install -m 0755 ${WORKDIR}/dbus-1.init.sh ${D}${sysconfdir}/init.d/dbus-1
123 install -d ${D}${sysconfdir}/default/volatiles
124 echo "d messagebus messagebus 0755 ${localstatedir}/run/dbus none" \
125 > ${D}${sysconfdir}/default/volatiles/99_dbus
123 fi 126 fi
124 127
125 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then 128 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
@@ -131,10 +134,6 @@ do_install() {
131 ln -fs ../dbus.service ${D}${systemd_system_unitdir}/multi-user.target.wants/dbus.service 134 ln -fs ../dbus.service ${D}${systemd_system_unitdir}/multi-user.target.wants/dbus.service
132 fi 135 fi
133 136
134 install -d ${D}${sysconfdir}/default/volatiles
135 echo "d messagebus messagebus 0755 ${localstatedir}/run/dbus none" \
136 > ${D}${sysconfdir}/default/volatiles/99_dbus
137
138 137
139 mkdir -p ${D}${localstatedir}/lib/dbus 138 mkdir -p ${D}${localstatedir}/lib/dbus
140 139