From 2b2813bd04e5eadac0dab0516af71bc4efc73673 Mon Sep 17 00:00:00 2001 From: Andrew Shadura Date: Tue, 2 Feb 2016 18:04:51 +0100 Subject: dbus: use ${systemd_system_unitdir} Signed-off-by: Andrew Shadura Signed-off-by: Richard Purdie --- meta/recipes-core/dbus/dbus_1.10.6.bb | 16 ++++++++-------- 1 file 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* \ ${datadir}/dbus-1/session.conf \ ${datadir}/dbus-1/system.d \ ${datadir}/dbus-1/system.conf \ - ${systemd_unitdir}/system/" + ${systemd_system_unitdir}" FILES_${PN}-lib = "${libdir}/lib*.so.*" RRECOMMENDS_${PN}-lib = "${PN}" FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-test-tool" @@ -102,7 +102,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', PACKAGECONFIG_class-native = "" PACKAGECONFIG_class-nativesdk = "" -PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_unitdir}/system/,--disable-systemd --without-systemdsystemunitdir,systemd" +PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_system_unitdir},--disable-systemd --without-systemdsystemunitdir,systemd" PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x --disable-x11-autolaunch, virtual/libx11 libsm" PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile,," @@ -117,12 +117,12 @@ do_install() { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then for i in dbus.target.wants sockets.target.wants multi-user.target.wants; do \ - install -d ${D}${systemd_unitdir}/system/$i; done - install -m 0644 ${B}/bus/dbus.service ${B}/bus/dbus.socket ${D}${systemd_unitdir}/system/ - cd ${D}${systemd_unitdir}/system/dbus.target.wants/ - ln -fs ../dbus.socket ${D}${systemd_unitdir}/system/dbus.target.wants/dbus.socket - ln -fs ../dbus.socket ${D}${systemd_unitdir}/system/sockets.target.wants/dbus.socket - ln -fs ../dbus.service ${D}${systemd_unitdir}/system/multi-user.target.wants/dbus.service + install -d ${D}${systemd_system_unitdir}/$i; done + install -m 0644 ${B}/bus/dbus.service ${B}/bus/dbus.socket ${D}${systemd_system_unitdir}/ + cd ${D}${systemd_system_unitdir}/dbus.target.wants/ + ln -fs ../dbus.socket ${D}${systemd_system_unitdir}/dbus.target.wants/dbus.socket + ln -fs ../dbus.socket ${D}${systemd_system_unitdir}/sockets.target.wants/dbus.socket + ln -fs ../dbus.service ${D}${systemd_system_unitdir}/multi-user.target.wants/dbus.service fi install -d ${D}${sysconfdir}/default/volatiles -- cgit 1.2.3-korg