mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-29 09:32:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

weston: Fix bug causing the xwayland package to always be included

Browse Source 
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.

(From OE-Core rev: 918ef140dbcfb8dd6e5774a1ce57162de814661c)

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Tom Hochstein
2016-06-09 18:09:19 -05:00
committed by Richard Purdie
parent 0c9c3498a0
commit cfac890048
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
meta/recipes-graphics/wayland/weston_1.10.0.bb
View File

@@ -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"