diff options
| author | Andreas Müller <schnitzeltony@googlemail.com> | 2012-03-22 12:06:00 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-22 16:44:54 +0000 |
| commit | f014feb73cd96c35735811737a80ee8cd1528f61 (patch) | |
| tree | e8f26ea140615d1bacdcdcb5e3ac8c4705d2c664 /meta | |
| parent | d05480ddcfb3270357f578fefba5855f5209714c (diff) | |
| download | openembedded-core-f014feb73cd96c35735811737a80ee8cd1528f61.tar.gz openembedded-core-f014feb73cd96c35735811737a80ee8cd1528f61.tar.bz2 openembedded-core-f014feb73cd96c35735811737a80ee8cd1528f61.tar.xz openembedded-core-f014feb73cd96c35735811737a80ee8cd1528f61.zip | |
dbus: use systemd_unitdir
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-core/dbus/dbus.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc index 588209fb8..a75583d6a 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() { |