diff options
| author |   Andreas Müller <schnitzeltony@gmail.com> | 2021-05-02 22:01:28 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-05-06 08:41:21 +0100 |
| commit | ace7a71b09df24de7b70f52edcd425366f39d56e (patch) | |
| tree | d5adcd81b681ee08824a673e2b79455bfc871f1a /meta/recipes-graphics | |
| parent | a48178f6d00e7f97a09f42d5a164204e9dcffa9f (diff) | |
| download | openembedded-core-contrib-ace7a71b09df24de7b70f52edcd425366f39d56e.tar.gz | |
xwayland: remove protocol.txt - it clashes with xserver-xorg
* Images with wayland-compositors + xwayland + xserver fail to build
* Fedora - they introduced standalone xwayland - does same [1]
[1] https://src.fedoraproject.org/rpms/xorg-x11-server-Xwayland/blob/rawhide/f/xorg-x11-server-Xwayland.spec
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
| -rw-r--r-- | meta/recipes-graphics/xwayland/xwayland_21.1.1.bb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xwayland/xwayland_21.1.1.bb b/meta/recipes-graphics/xwayland/xwayland_21.1.1.bb index b2ff25fbbc..8b1c96fc4a 100644 --- a/meta/recipes-graphics/xwayland/xwayland_21.1.1.bb +++ b/meta/recipes-graphics/xwayland/xwayland_21.1.1.bb @@ -17,5 +17,10 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl" DEPENDS += "xorgproto xtrans pixman libxkbfile libxfont2 wayland wayland-native wayland-protocols libdrm libepoxy" +do_install_append() { + # remove files not needed and clashing with xserver-xorg + rm -rf ${D}/${libdir}/xorg/ +} + FILES_${PN} += "${libdir}/xorg/protocol.txt" |