sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Andreas Müller 2012-03-22 12:06:00 +01:00 committed by Richard Purdie
parent a4fcab8d05
commit 4a781306d8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
meta/recipes-core/dbus/dbus.inc
View File

@ -10,7 +10,7 @@ DEPENDS = "expat virtual/libintl ${@base_contains('DISTRO_FEATURES', 'x11', '${X
DEPENDS_virtclass-native = "expat-native virtual/libintl-native"
DEPENDS_virtclass-nativesdk = "expat-nativesdk virtual/libintl-nativesdk virtual/libx11"
INC_PR = "r2"
INC_PR = "r3"
SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
file://tmpdir.patch; \
@ -36,7 +36,7 @@ PACKAGES =+ "${PN}-lib ${PN}-systemd ${@base_contains('DISTRO_FEATURES', 'x11',
FILES_${PN}-x11 = "${bindir}/dbus-launch"
RDEPENDS_${PN}-x11 = "${PN}"
FILES_${PN}-systemd = "${base_libdir}/systemd/system/"
FILES_${PN}-systemd = "${systemd_unitdir}/system/"
FILES_${PN} = "${bindir}/dbus-daemon* \
${bindir}/dbus-uuidgen \
@ -67,7 +67,7 @@ EXTRA_OECONF = "--disable-tests \
--disable-doxygen-docs \
--disable-libaudit \
--with-xml=expat \
--with-systemdsystemunitdir=${base_libdir}/systemd/system/ \
--with-systemdsystemunitdir=${systemd_unitdir}/system/ \
${EXTRA_OECONF_X}"
do_install() {
@ -96,7 +96,7 @@ do_install() {
# disable dbus-1 sysv script on systemd installs
# nearly all distros call the initscript plain 'dbus', but OE-core is different
ln -sf /dev/null ${D}/${base_libdir}/systemd/system/dbus-1.service
ln -sf /dev/null ${D}/${systemd_unitdir}/system/dbus-1.service
}
do_install_virtclass-native() {