From 918ef140dbcfb8dd6e5774a1ce57162de814661c Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Thu, 9 Jun 2016 18:09:19 -0500 Subject: weston: Fix bug causing the xwayland package to always be included The xwayland package was always being built due to its inclusion in PACKAGE_BEFORE_PN. The effect was masked by making the RDEPENDS conditional. Now we make the PACKAGE_BEFORE_PN inclusion conditional and restore the xwayland RDEPENDS to unconditional. Signed-off-by: Tom Hochstein Signed-off-by: Ross Burton --- meta/recipes-graphics/wayland/weston_1.10.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/wayland/weston_1.10.0.bb b/meta/recipes-graphics/wayland/weston_1.10.0.bb index 37a4839e0f..6b934e2232 100644 --- a/meta/recipes-graphics/wayland/weston_1.10.0.bb +++ b/meta/recipes-graphics/wayland/weston_1.10.0.bb @@ -100,14 +100,14 @@ do_install_append() { fi } -PACKAGE_BEFORE_PN += "${PN}-xwayland" +PACKAGE_BEFORE_PN += "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', '${PN}-xwayland', '', d)}" PACKAGES += "${PN}-examples" FILES_${PN} = "${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${libdir}/${BPN}/*.so ${datadir}" FILES_${PN}-examples = "${bindir}/*" FILES_${PN}-xwayland = "${libdir}/${BPN}/xwayland.so" -RDEPENDS_${PN}-xwayland += "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'xserver-xorg-xwayland', '', d)}" +RDEPENDS_${PN}-xwayland += "xserver-xorg-xwayland" RDEPENDS_${PN} += "xkeyboard-config" RRECOMMENDS_${PN} = "liberation-fonts" -- cgit 1.2.3-korg