From ab4006bb2e6f51ea49c074fc0e9b1a50c96c01e1 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 26 Jul 2017 12:49:31 +0200 Subject: weston: use just one append and one bb.utils.contains * drop duplicated --enable-rpi-compositor and WESTON_NATIVE_BACKEND=rpi-backend.so * use rpi override, adding --enable-rpi-compositor unconditionally breaks other MACHINEs with: configure: WARNING: unrecognized options: --enable-rpi-compositor * use just one append and one bb.utils.contains to save some bitbake cycles while parsing Signed-off-by: Martin Jansa --- recipes-graphics/wayland/weston_%.bbappend | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'recipes-graphics') diff --git a/recipes-graphics/wayland/weston_%.bbappend b/recipes-graphics/wayland/weston_%.bbappend index f2cb7aa..1dac41c 100644 --- a/recipes-graphics/wayland/weston_%.bbappend +++ b/recipes-graphics/wayland/weston_%.bbappend @@ -1,12 +1,12 @@ -EXTRA_OECONF_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' --enable-rpi-compositor WESTON_NATIVE_BACKEND=rpi-backend.so', d)}" - PACKAGECONFIG_remove_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'fbdev', '', d)}" -EXTRA_OECONF += "--disable-xwayland-test \ - --disable-simple-egl-clients \ +EXTRA_OECONF_append_rpi = " \ + --disable-xwayland-test \ + --disable-simple-egl-clients \ + ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' \ + --enable-rpi-compositor \ + --disable-resize-optimization \ + --disable-setuid-install \ + WESTON_NATIVE_BACKEND=rpi-backend.so \ + ', d)} \ " - -EXTRA_OECONF += "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '--enable-rpi-compositor', d)}" -EXTRA_OECONF += "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '--disable-resize-optimization', d)}" -EXTRA_OECONF += "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '--disable-setuid-install', d)}" -EXTRA_OECONF += "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'WESTON_NATIVE_BACKEND=rpi-backend.so', d)}" -- cgit v1.2.3-54-g00ecf