diff options
| author |   Tom Hochstein <tom.hochstein@nxp.com> | 2016-06-09 18:09:19 -0500 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-12 23:47:18 +0100 |
| commit | cfac89004801d36ec268a94103b4f9c77749cf62 (patch) | |
| tree | 88504ff95782dc877f3b043c6538c6d8be710aa3 /meta/recipes-graphics | |
| parent | 0c9c3498a0fa9a9d1579500689550bac0378c52d (diff) | |
| download | openembedded-core-contrib-cfac89004801d36ec268a94103b4f9c77749cf62.tar.gz | |
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.
(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>
Diffstat (limited to 'meta/recipes-graphics')
| -rw-r--r-- | meta/recipes-graphics/wayland/weston_1.10.0.bb | 4 |
1 files 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" |