summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-10-31 09:52:05 -0700
committerAndrei Gherzan <andrei@gherzan.ro>2016-11-08 12:02:38 +0100
commit6c755af27589f14a799e4aa45563e31615963b20 (patch)
treed92e4a028dd7a22c241b90c497a0f8bb910d9600
parentb9e6f04ce655395f9e7e1ab7cb049715170fec37 (diff)
downloadmeta-raspberrypi-6c755af27589f14a799e4aa45563e31615963b20.tar.gz
weston: Unify bbappends for weston into single file
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--recipes-graphics/wayland/weston_%.bbappend10
-rw-r--r--recipes-graphics/weston/weston_%.bbappend8
2 files changed, 10 insertions, 8 deletions
diff --git a/recipes-graphics/wayland/weston_%.bbappend b/recipes-graphics/wayland/weston_%.bbappend
index 57b8079..f2cb7aa 100644
--- a/recipes-graphics/wayland/weston_%.bbappend
+++ b/recipes-graphics/wayland/weston_%.bbappend
@@ -1,2 +1,12 @@
1EXTRA_OECONF_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' --enable-rpi-compositor WESTON_NATIVE_BACKEND=rpi-backend.so', d)}" 1EXTRA_OECONF_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' --enable-rpi-compositor WESTON_NATIVE_BACKEND=rpi-backend.so', d)}"
2 2
3PACKAGECONFIG_remove_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'fbdev', '', d)}"
4
5EXTRA_OECONF += "--disable-xwayland-test \
6 --disable-simple-egl-clients \
7"
8
9EXTRA_OECONF += "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '--enable-rpi-compositor', d)}"
10EXTRA_OECONF += "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '--disable-resize-optimization', d)}"
11EXTRA_OECONF += "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '--disable-setuid-install', d)}"
12EXTRA_OECONF += "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'WESTON_NATIVE_BACKEND=rpi-backend.so', d)}"
diff --git a/recipes-graphics/weston/weston_%.bbappend b/recipes-graphics/weston/weston_%.bbappend
deleted file mode 100644
index b964542..0000000
--- a/recipes-graphics/weston/weston_%.bbappend
+++ /dev/null
@@ -1,8 +0,0 @@
1PACKAGECONFIG_remove_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', ' fbdev', '', d)}"
2EXTRA_OECONF += "--disable-xwayland-test \
3 --disable-simple-egl-clients \
4"
5EXTRA_OECONF += "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '--enable-rpi-compositor', d)}"
6EXTRA_OECONF += "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '--disable-resize-optimization', d)}"
7EXTRA_OECONF += "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '--disable-setuid-install', d)}"
8EXTRA_OECONF += "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'WESTON_NATIVE_BACKEND=rpi-backend.so', d)}"