[OE-core] [PATCH v3] dbus: include dbus-launch in the main dbus package

[Radu Moisan]

it does not build, it complains about nothing providing dbus-x11

Radu

On 07/26/2012 09:17 AM, Radu Moisan wrote:
> Followed suggestions from Bugz 2261:
>
> 1) remove the --with-x/--without-x configure arguments. If you want to force
> no-discovery for native builds the correct argument is --disable-x11-autolaunch.
> This ensures that DBus looks at the build environment to determine whether to
> enable X11 bus discovery or not.
>
> 2) make the virtual/libx11 DEPENDS conditional based on the x11 distro feature.
> This makes the build dependencies reflect the feature list.
>
> 3) remove dbus-x11, meaning that dbus-launch with its potential X11 dependency
> is now back in dbus where is belongs.
>
> 4) Potentially make dbus provide dbus-x11, for compatibility.
>
> Fixes [Yocto #2261]
>
> Signed-off-by: Radu Moisan <radu.moisan at intel.com>
> ---
>   meta/recipes-core/dbus/dbus.inc |   11 ++++++-----
>   1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
> index a75583d..9559f6f 100644
> --- a/meta/recipes-core/dbus/dbus.inc
> +++ b/meta/recipes-core/dbus/dbus.inc
> @@ -31,10 +31,10 @@ CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session
>   
>   DEBIANNAME_${PN} = "dbus-1"
>   
> -PACKAGES =+ "${PN}-lib ${PN}-systemd ${@base_contains('DISTRO_FEATURES', 'x11', '${PN}-x11', '', d)}"
> +PACKAGES =+ "${PN}-lib ${PN}-systemd"
>   
> -FILES_${PN}-x11 = "${bindir}/dbus-launch"
> -RDEPENDS_${PN}-x11 = "${PN}"
> +# for compatibility
> +RREPLACES_${PN} += "dbus-x11"
>   
>   FILES_${PN}-systemd = "${systemd_unitdir}/system/"
>   
> @@ -43,6 +43,7 @@ FILES_${PN} = "${bindir}/dbus-daemon* \
>                  ${bindir}/dbus-cleanup-sockets \
>                  ${bindir}/dbus-send \
>                  ${bindir}/dbus-monitor \
> +               ${bindir}/dbus-launch \
>                  ${libexecdir}/dbus* \
>                  ${sysconfdir} \
>                  ${localstatedir} \
> @@ -58,8 +59,8 @@ pkg_postinst_dbus() {
>   	fi
>   }
>   
> -EXTRA_OECONF_X = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}"
> -EXTRA_OECONF_X_virtclass-native = "--without-x"
> +EXTRA_OECONF_X = ""
> +EXTRA_OECONF_X_virtclass-native = "--disable-x11-autolaunch"
>   
>   EXTRA_OECONF = "--disable-tests \
>                   --disable-checks \