From 7e8772e42b4c5db14d51e2d7d49fd5257ec314cd Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 18 Aug 2015 06:58:24 -0300 Subject: Revert "mesa-demos: Support for mx6 without GPUs" This reverts commit 44a5115b6ece869cfb10714423e6956128dbaef8. The change breaks machine using multiple SoC types and a better technical solution is still under investigation. In meanwhile we are reverting this in Fido branch so we do not break stable users. Signed-off-by: Otavio Salvador --- recipes-graphics/mesa/mesa-demos_%.bbappend | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/recipes-graphics/mesa/mesa-demos_%.bbappend b/recipes-graphics/mesa/mesa-demos_%.bbappend index c8d1667..65f3d53 100644 --- a/recipes-graphics/mesa/mesa-demos_%.bbappend +++ b/recipes-graphics/mesa/mesa-demos_%.bbappend @@ -9,11 +9,4 @@ SRC_URI_append_mx6dl = " ${MESA-DEMO-PATCH}" SRC_URI_append_mx6sx = " ${MESA-DEMO-PATCH}" SRC_URI_append_mx6sl = " ${MESA-DEMO-PATCH}" -REMOVE_GLU = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', \ - bb.utils.contains('DISTRO_FEATURES', 'wayland', 'glu', '', d), d)}" - -# only remove GLU on mx6 thave have a GPU -PACKAGECONFIG_remove_mx6q = "${REMOVE_GLU}" -PACKAGECONFIG_remove_mx6dl = "${REMOVE_GLU}" -PACKAGECONFIG_remove_mx6sx = "${REMOVE_GLU}" -PACKAGECONFIG_remove_mx6sl = "gles1 gles2 ${REMOVE_GLU}" +PACKAGECONFIG_remove_mx6sl = "gles1 gles2" -- cgit v1.2.3-54-g00ecf