]> code.ossystems Code Review - openembedded-core.git/commitdiff
xwayland: remove protocol.txt - it clashes with xserver-xorg
authorAndreas Müller <schnitzeltony@gmail.com>
Sun, 2 May 2021 20:01:28 +0000 (22:01 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 6 May 2021 07:41:21 +0000 (08:41 +0100)
* 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>
meta/recipes-graphics/xwayland/xwayland_21.1.1.bb

index b2ff25fbbcc614637e023968345535fc5df4e637..8b1c96fc4aed8c5e361970326e87f51d1a570f83 100644 (file)
@@ -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"