[OE-core] [PATCH] dbus 1.4.1: enable systemd support, but package systemd files seperately

[Koen Kooi]

This one depends on the dbus-x11 change patchset sent earlier

Op 26 mei 2011, om 11:09 heeft Koen Kooi het volgende geschreven:

> Systemd support in dbus only affects 'make install', so no changes for sysvinit based systems
> 
> Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>
> ---
> meta/recipes-core/dbus/dbus.inc      |    5 ++++-
> meta/recipes-core/dbus/dbus_1.4.1.bb |    2 +-
> 2 files changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
> index acf43d5..8275a1b 100644
> --- a/meta/recipes-core/dbus/dbus.inc
> +++ b/meta/recipes-core/dbus/dbus.inc
> @@ -21,10 +21,12 @@ CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session
> 
> DEBIANNAME_${PN} = "dbus-1"
> 
> -PACKAGES =+ "${PN}-lib ${PN}-x11"
> +PACKAGES =+ "${PN}-lib ${PN}-x11 ${PN}-systemd"
> 
> FILES_${PN}-x11 = "${bindir}/dbus-launch"
> 
> +FILES_${PN}-systemd = "${base_libdir}/systemd/system/"
> +
> FILES_${PN} = "${bindir}/dbus-daemon* \
>                ${bindir}/dbus-uuidgen \
>                ${bindir}/dbus-launch \
> @@ -73,6 +75,7 @@ EXTRA_OECONF = "--disable-tests \
>                 --disable-doxygen-docs \
>                 --disable-libaudit \
>                 --with-xml=expat \
> +                --with-systemdsystemunitdir=${base_libdir}/systemd/system/ \
>                 ${EXTRA_OECONF_X}"
> 
> do_install() {
> diff --git a/meta/recipes-core/dbus/dbus_1.4.1.bb b/meta/recipes-core/dbus/dbus_1.4.1.bb
> index d1c59dc..00720fd 100644
> --- a/meta/recipes-core/dbus/dbus_1.4.1.bb
> +++ b/meta/recipes-core/dbus/dbus_1.4.1.bb
> @@ -1,6 +1,6 @@
> include dbus.inc
> 
> -PR = "r2"
> +PR = "r3"
> 
> SRC_URI[md5sum] = "99cb057700c0455fb68f8d57902f77ac"
> SRC_URI[sha256sum] = "caa1a0ded2d0f2e95c1d4ec7e3c8bd44834928c5b0ed41a7189963f3593983bd"
> -- 
> 1.6.6.1
>