From 7f7bc9e778b6def018c451ecb23f5169cd18f5ed Mon Sep 17 00:00:00 2001 From: Hugo Hromic Date: Tue, 15 May 2018 15:35:29 +0100 Subject: wayland: only remove libwayland-egl if not using vc4graphics, e.g. when using userland Related to PR #247. Signed-off-by: Hugo Hromic --- recipes-graphics/wayland/wayland_%.bbappend | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/recipes-graphics/wayland/wayland_%.bbappend b/recipes-graphics/wayland/wayland_%.bbappend index ee2676a..e5bbf4a 100644 --- a/recipes-graphics/wayland/wayland_%.bbappend +++ b/recipes-graphics/wayland/wayland_%.bbappend @@ -1,6 +1,7 @@ -# remove provided `libwayland-egl` library in favour of the version in `userland` until fully tested - +# until fully tested, prefer `libwayland-egl` provided by `userland` instead of `wayland` when not using vc4graphics do_install_append_rpi () { - rm -f ${D}${libdir}/libwayland-egl* - rm -f ${D}${libdir}/pkgconfig/wayland-egl.pc + if [ "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "1", "0", d)}" = "0" ]; then + rm -f ${D}${libdir}/libwayland-egl* + rm -f ${D}${libdir}/pkgconfig/wayland-egl.pc + fi } -- cgit v1.2.3-54-g00ecf