diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2017-07-26 12:49:31 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-07-27 10:56:34 +0200 |
commit | ab4006bb2e6f51ea49c074fc0e9b1a50c96c01e1 (patch) | |
tree | 846dcde8ea2a05a0aa9f0483c7105a47a511d65f | |
parent | f6a2ca21c72b8d97cd0f89a0a436bf90b431698b (diff) | |
download | meta-raspberrypi-ab4006bb2e6f51ea49c074fc0e9b1a50c96c01e1.tar.gz |
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 <Martin.Jansa@gmail.com>
-rw-r--r-- | recipes-graphics/wayland/weston_%.bbappend | 18 |
1 files changed, 9 insertions, 9 deletions
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 @@ | |||
1 | EXTRA_OECONF_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' --enable-rpi-compositor WESTON_NATIVE_BACKEND=rpi-backend.so', d)}" | ||
2 | |||
3 | PACKAGECONFIG_remove_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'fbdev', '', d)}" | 1 | PACKAGECONFIG_remove_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'fbdev', '', d)}" |
4 | 2 | ||
5 | EXTRA_OECONF += "--disable-xwayland-test \ | 3 | EXTRA_OECONF_append_rpi = " \ |
6 | --disable-simple-egl-clients \ | 4 | --disable-xwayland-test \ |
5 | --disable-simple-egl-clients \ | ||
6 | ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' \ | ||
7 | --enable-rpi-compositor \ | ||
8 | --disable-resize-optimization \ | ||
9 | --disable-setuid-install \ | ||
10 | WESTON_NATIVE_BACKEND=rpi-backend.so \ | ||
11 | ', d)} \ | ||
7 | " | 12 | " |
8 | |||
9 | EXTRA_OECONF += "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '--enable-rpi-compositor', d)}" | ||
10 | EXTRA_OECONF += "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '--disable-resize-optimization', d)}" | ||
11 | EXTRA_OECONF += "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '--disable-setuid-install', d)}" | ||
12 | EXTRA_OECONF += "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'WESTON_NATIVE_BACKEND=rpi-backend.so', d)}" | ||