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:26 +0100 |
| commit | d71ed04ebf950c461aa833f6349b3ae7b6c7250c (patch) | |
| tree | b5b1071da9a512a7d9e060328bed5cd9c6d05e49 | |
| parent | e3887b0690e84e0591283a365a37f44d474013e0 (diff) | |
| download | poky-d71ed04ebf950c461aa833f6349b3ae7b6c7250c.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
(From OE-Core rev: ace7a71b09df24de7b70f52edcd425366f39d56e)
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -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" | |||
| 17 | 17 | ||
| 18 | DEPENDS += "xorgproto xtrans pixman libxkbfile libxfont2 wayland wayland-native wayland-protocols libdrm libepoxy" | 18 | DEPENDS += "xorgproto xtrans pixman libxkbfile libxfont2 wayland wayland-native wayland-protocols libdrm libepoxy" |
| 19 | 19 | ||
| 20 | do_install_append() { | ||
| 21 | # remove files not needed and clashing with xserver-xorg | ||
| 22 | rm -rf ${D}/${libdir}/xorg/ | ||
| 23 | } | ||
| 24 | |||
| 20 | FILES_${PN} += "${libdir}/xorg/protocol.txt" | 25 | FILES_${PN} += "${libdir}/xorg/protocol.txt" |
| 21 | 26 | ||