aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-graphics
diff options
context:
space:
mode:
authorHugo Hromic <hhromic@gmail.com>2018-05-15 15:35:29 +0100
committerAndrei Gherzan <andrei@gherzan.com>2018-05-16 19:24:15 +0100
commit7f7bc9e778b6def018c451ecb23f5169cd18f5ed (patch)
tree8df8ae55fa3108c9a16e0e9a0b22ee0e569a28bd /recipes-graphics
parent1fb4dcc0b57bb51aac9c047f17048e1121b690fb (diff)
downloadmeta-raspberrypi-7f7bc9e778b6def018c451ecb23f5169cd18f5ed.tar.gz
meta-raspberrypi-7f7bc9e778b6def018c451ecb23f5169cd18f5ed.tar.bz2
meta-raspberrypi-7f7bc9e778b6def018c451ecb23f5169cd18f5ed.zip
wayland: only remove libwayland-egl if not using vc4graphics, e.g. when using userland
Related to PR #247. Signed-off-by: Hugo Hromic <hhromic@gmail.com>
Diffstat (limited to 'recipes-graphics')
-rw-r--r--recipes-graphics/wayland/wayland_%.bbappend9
1 files 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
}