Patchwork [5/7] dbus: use systemd_unitdir

login
register
mail settings
Submitter Andreas Müller
Date March 22, 2012, 11:06 a.m.
Message ID <1332414362-6406-5-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/24127/
State Accepted
Commit f014feb73cd96c35735811737a80ee8cd1528f61
Headers show

Comments

Andreas Müller - March 22, 2012, 11:06 a.m.
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta/recipes-core/dbus/dbus.inc |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

Patch

diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 588209f..a75583d 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
 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() {