[OE-core] [PATCH 1/2] dbus: build with systemd support

[Jussi Kukkonen]

On 20 November 2015 at 16:38, Andrew Shadura <andrew.shadura at collabora.co.uk>
wrote:
>
> It's good to have the extra functionality, such as seat support
> provided with systemd support. Not least of all to support
> systemd user-sessions.
>
> This commit also changes references to the system unit path
> from ${systemd_unitdir}/system to ${systemd_system_unitdir},
> a new variable provided by bitbake.
>
> Signed-off-by: Andrew Shadura <andrew.shadura at collabora.co.uk>
> Signed-off-by: Joshua Lock <joshua.lock at collabora.co.uk>
> ---
>  meta/recipes-core/dbus/dbus_1.10.2.bb | 19 ++++++++-----------
>  1 file changed, 8 insertions(+), 11 deletions(-)
>
> diff --git a/meta/recipes-core/dbus/dbus_1.10.2.bb
b/meta/recipes-core/dbus/dbus_1.10.2.bb
> index 1abe067..f7ab39b 100644
> --- a/meta/recipes-core/dbus/dbus_1.10.2.bb
> +++ b/meta/recipes-core/dbus/dbus_1.10.2.bb
> @@ -68,7 +68,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-glib-tool
${bindir}/dbus-test-tool"
> @@ -90,8 +90,7 @@ pkg_postinst_dbus() {
>  EXTRA_OECONF = "--disable-tests \
>                  --disable-xml-docs \
>                  --disable-doxygen-docs \
> -                --disable-libaudit \
> -                --disable-systemd"
> +                --disable-libaudit"
>
>  EXTRA_OECONF_append_class-native = " --disable-selinux"
>
> @@ -100,9 +99,7 @@ PACKAGECONFIG ??=
"${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd',
>  PACKAGECONFIG_class-native = ""
>  PACKAGECONFIG_class-nativesdk = ""
>
> -# Would like to --enable-systemd but that's a circular build-dependency
between
> -# systemd<->dbus

Has this issue been somehow resolved since the comment was added?

> -PACKAGECONFIG[systemd] =
"--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir"
> +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[apparmor] =
"--enable-apparmor,--disable-apparmor,libapparmor"
>
> @@ -117,12 +114,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/
> +                       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_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
> +               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
> --
> 2.5.0
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20151120/c175e48f/attachment-0002.html>