summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Shadura <andrew.shadura@collabora.co.uk>2016-02-02 18:04:51 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-04 13:09:55 +0000
commit877eae1850174d29b26873673e7331affd795e7e (patch)
tree03e4a9f147e164e02bea4169f07bc7ae3db74ebc
parent60100884d4d6a20aaf499d7afcf7fc91faabd22e (diff)
downloadpoky-877eae1850174d29b26873673e7331affd795e7e.tar.gz
dbus: use ${systemd_system_unitdir}
(From OE-Core rev: 2b2813bd04e5eadac0dab0516af71bc4efc73673) Signed-off-by: Andrew Shadura <andrew.shadura@collabora.co.uk> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/dbus/dbus_1.10.6.bb16
1 files changed, 8 insertions, 8 deletions
diff --git a/meta/recipes-core/dbus/dbus_1.10.6.bb b/meta/recipes-core/dbus/dbus_1.10.6.bb
index 5ba3f21242..fec68a474b 100644
--- a/meta/recipes-core/dbus/dbus_1.10.6.bb
+++ b/meta/recipes-core/dbus/dbus_1.10.6.bb
@@ -69,7 +69,7 @@ FILES_${PN} = "${bindir}/dbus-daemon* \
69 ${datadir}/dbus-1/session.conf \ 69 ${datadir}/dbus-1/session.conf \
70 ${datadir}/dbus-1/system.d \ 70 ${datadir}/dbus-1/system.d \
71 ${datadir}/dbus-1/system.conf \ 71 ${datadir}/dbus-1/system.conf \
72 ${systemd_unitdir}/system/" 72 ${systemd_system_unitdir}"
73FILES_${PN}-lib = "${libdir}/lib*.so.*" 73FILES_${PN}-lib = "${libdir}/lib*.so.*"
74RRECOMMENDS_${PN}-lib = "${PN}" 74RRECOMMENDS_${PN}-lib = "${PN}"
75FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-test-tool" 75FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-test-tool"
@@ -102,7 +102,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd',
102PACKAGECONFIG_class-native = "" 102PACKAGECONFIG_class-native = ""
103PACKAGECONFIG_class-nativesdk = "" 103PACKAGECONFIG_class-nativesdk = ""
104 104
105PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_unitdir}/system/,--disable-systemd --without-systemdsystemunitdir,systemd" 105PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_system_unitdir},--disable-systemd --without-systemdsystemunitdir,systemd"
106PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x --disable-x11-autolaunch, virtual/libx11 libsm" 106PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x --disable-x11-autolaunch, virtual/libx11 libsm"
107PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile,," 107PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile,,"
108 108
@@ -117,12 +117,12 @@ do_install() {
117 117
118 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then 118 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
119 for i in dbus.target.wants sockets.target.wants multi-user.target.wants; do \ 119 for i in dbus.target.wants sockets.target.wants multi-user.target.wants; do \
120 install -d ${D}${systemd_unitdir}/system/$i; done 120 install -d ${D}${systemd_system_unitdir}/$i; done
121 install -m 0644 ${B}/bus/dbus.service ${B}/bus/dbus.socket ${D}${systemd_unitdir}/system/ 121 install -m 0644 ${B}/bus/dbus.service ${B}/bus/dbus.socket ${D}${systemd_system_unitdir}/
122 cd ${D}${systemd_unitdir}/system/dbus.target.wants/ 122 cd ${D}${systemd_system_unitdir}/dbus.target.wants/
123 ln -fs ../dbus.socket ${D}${systemd_unitdir}/system/dbus.target.wants/dbus.socket 123 ln -fs ../dbus.socket ${D}${systemd_system_unitdir}/dbus.target.wants/dbus.socket
124 ln -fs ../dbus.socket ${D}${systemd_unitdir}/system/sockets.target.wants/dbus.socket 124 ln -fs ../dbus.socket ${D}${systemd_system_unitdir}/sockets.target.wants/dbus.socket
125 ln -fs ../dbus.service ${D}${systemd_unitdir}/system/multi-user.target.wants/dbus.service 125 ln -fs ../dbus.service ${D}${systemd_system_unitdir}/multi-user.target.wants/dbus.service
126 fi 126 fi
127 127
128 install -d ${D}${sysconfdir}/default/volatiles 128 install -d ${D}${sysconfdir}/default/volatiles