summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2012-03-22 12:06:00 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-22 16:47:08 +0000
commit4a781306d8e73298840d653654e4efe74bc45c90 (patch)
treeb19f6cd9d2de75439b7b6e1bf2667ddf785523c3
parenta4fcab8d0513140a3c01a2274228e5413b3f25f4 (diff)
downloadpoky-4a781306d8e73298840d653654e4efe74bc45c90.tar.gz
dbus: use systemd_unitdir
(From OE-Core rev: f014feb73cd96c35735811737a80ee8cd1528f61) Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/dbus/dbus.inc8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 588209fb80..a75583d6a3 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -10,7 +10,7 @@ DEPENDS = "expat virtual/libintl ${@base_contains('DISTRO_FEATURES', 'x11', '${X
10DEPENDS_virtclass-native = "expat-native virtual/libintl-native" 10DEPENDS_virtclass-native = "expat-native virtual/libintl-native"
11DEPENDS_virtclass-nativesdk = "expat-nativesdk virtual/libintl-nativesdk virtual/libx11" 11DEPENDS_virtclass-nativesdk = "expat-nativesdk virtual/libintl-nativesdk virtual/libx11"
12 12
13INC_PR = "r2" 13INC_PR = "r3"
14 14
15SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ 15SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
16 file://tmpdir.patch; \ 16 file://tmpdir.patch; \
@@ -36,7 +36,7 @@ PACKAGES =+ "${PN}-lib ${PN}-systemd ${@base_contains('DISTRO_FEATURES', 'x11',
36FILES_${PN}-x11 = "${bindir}/dbus-launch" 36FILES_${PN}-x11 = "${bindir}/dbus-launch"
37RDEPENDS_${PN}-x11 = "${PN}" 37RDEPENDS_${PN}-x11 = "${PN}"
38 38
39FILES_${PN}-systemd = "${base_libdir}/systemd/system/" 39FILES_${PN}-systemd = "${systemd_unitdir}/system/"
40 40
41FILES_${PN} = "${bindir}/dbus-daemon* \ 41FILES_${PN} = "${bindir}/dbus-daemon* \
42 ${bindir}/dbus-uuidgen \ 42 ${bindir}/dbus-uuidgen \
@@ -67,7 +67,7 @@ EXTRA_OECONF = "--disable-tests \
67 --disable-doxygen-docs \ 67 --disable-doxygen-docs \
68 --disable-libaudit \ 68 --disable-libaudit \
69 --with-xml=expat \ 69 --with-xml=expat \
70 --with-systemdsystemunitdir=${base_libdir}/systemd/system/ \ 70 --with-systemdsystemunitdir=${systemd_unitdir}/system/ \
71 ${EXTRA_OECONF_X}" 71 ${EXTRA_OECONF_X}"
72 72
73do_install() { 73do_install() {
@@ -96,7 +96,7 @@ do_install() {
96 96
97 # disable dbus-1 sysv script on systemd installs 97 # disable dbus-1 sysv script on systemd installs
98 # nearly all distros call the initscript plain 'dbus', but OE-core is different 98 # nearly all distros call the initscript plain 'dbus', but OE-core is different
99 ln -sf /dev/null ${D}/${base_libdir}/systemd/system/dbus-1.service 99 ln -sf /dev/null ${D}/${systemd_unitdir}/system/dbus-1.service
100} 100}
101 101
102do_install_virtclass-native() { 102do_install_virtclass-native() {