summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2016-10-26 12:46:03 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2016-10-26 11:53:41 +0000
commitb3d0c4fcb89a716b3f692e9e8ebcea651608bce1 (patch)
treebcf3307fb7aec7c5218e7adfa87c48cde7320d5d
parent8c9bd4c1fc82500003b9952fc4f2a11a8355f47a (diff)
downloadmeta-boot2qt-b3d0c4fcb89a716b3f692e9e8ebcea651608bce1.tar.gz
dbus-session-init: fix broken init script
Change-Id: I3cefeb9b8c19dbd4f2e0bf9312088e6489b758c3 Reviewed-by: Risto Avila <risto.avila@qt.io>
-rw-r--r--recipes/dbus/dbus/dbus-session.service4
-rw-r--r--recipes/dbus/dbus_%.bbappend8
2 files changed, 6 insertions, 6 deletions
diff --git a/recipes/dbus/dbus/dbus-session.service b/recipes/dbus/dbus/dbus-session.service
index dbd6fcd..8dcf081 100644
--- a/recipes/dbus/dbus/dbus-session.service
+++ b/recipes/dbus/dbus/dbus-session.service
@@ -4,8 +4,8 @@ After=dbus.service
4 4
5[Service] 5[Service]
6Type=forking 6Type=forking
7ExecStart=/usr/bin/dbus-session.init start 7ExecStart=/usr/bin/dbus-session.init.sh start
8ExecStop=/usr/bin/dbus-session.init stop 8ExecStop=/usr/bin/dbus-session.init.sh stop
9Environment=HOME=/home/root 9Environment=HOME=/home/root
10 10
11[Install] 11[Install]
diff --git a/recipes/dbus/dbus_%.bbappend b/recipes/dbus/dbus_%.bbappend
index f9f1345..dde2927 100644
--- a/recipes/dbus/dbus_%.bbappend
+++ b/recipes/dbus/dbus_%.bbappend
@@ -45,21 +45,21 @@ SYSTEMD_PACKAGES =+ "${PN}-session-init"
45FILES_${PN}-session-init = " \ 45FILES_${PN}-session-init = " \
46 ${sysconfdir}/init.d/dbus-session \ 46 ${sysconfdir}/init.d/dbus-session \
47 ${sysconfdir}/profile.d/dbus-session-address \ 47 ${sysconfdir}/profile.d/dbus-session-address \
48 ${bindir}/dbus-session.init \ 48 ${bindir}/dbus-session.init.sh \
49 ${systemd_unitdir}/system/dbus-session.service \ 49 ${systemd_unitdir}/system/dbus-session.service \
50 " 50 "
51 51
52do_install_append_class-target() { 52do_install_append_class-target() {
53 sed 's:@bindir@:${bindir}:' < ${WORKDIR}/dbus-session.init >${WORKDIR}/dbus-session.init 53 sed 's:@bindir@:${bindir}:' < ${WORKDIR}/dbus-session.init >${WORKDIR}/dbus-session.init.sh
54 54
55 if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then 55 if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
56 install -d ${D}${sysconfdir}/init.d 56 install -d ${D}${sysconfdir}/init.d
57 install -m 0755 ${WORKDIR}/dbus-session.init ${D}${sysconfdir}/init.d/dbus-session 57 install -m 0755 ${WORKDIR}/dbus-session.init.sh ${D}${sysconfdir}/init.d/dbus-session
58 fi 58 fi
59 59
60 if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then 60 if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
61 install -m 0755 -d ${D}${bindir}/ 61 install -m 0755 -d ${D}${bindir}/
62 install -m 0755 ${WORKDIR}/dbus-session.init ${D}${bindir}/ 62 install -m 0755 ${WORKDIR}/dbus-session.init.sh ${D}${bindir}/
63 63
64 install -m 0755 -d ${D}${systemd_unitdir}/system 64 install -m 0755 -d ${D}${systemd_unitdir}/system
65 install -m 0644 ${WORKDIR}/dbus-session.service ${D}${systemd_unitdir}/system/ 65 install -m 0644 ${WORKDIR}/dbus-session.service ${D}${systemd_unitdir}/system/