[yocto] [meta-raspberrypi][PATCH 3/6] weston: Unify bbappends for weston into single file

[Andrei Gherzan]

On Mon, Oct 31, 2016 at 09:52:05AM -0700, Khem Raj wrote:
> Signed-off-by: Khem Raj <raj.khem at gmail.com>
> ---
>  recipes-graphics/wayland/weston_%.bbappend | 10 ++++++++++
>  recipes-graphics/weston/weston_%.bbappend  |  8 --------
>  2 files changed, 10 insertions(+), 8 deletions(-)
>  delete mode 100644 recipes-graphics/weston/weston_%.bbappend
>
> 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 @@
>  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 += "${@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)}"
> 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 @@
> -PACKAGECONFIG_remove_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', ' fbdev', '', d)}"
> -EXTRA_OECONF += "--disable-xwayland-test \
> -                 --disable-simple-egl-clients \
> -"
> -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)}"
> --
> 2.10.1
>
> --
> _______________________________________________
> yocto mailing list
> yocto at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto

Merged to master. Thanks.
--
Andrei Gherzan
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: not available
URL: <http://lists.yoctoproject.org/pipermail/yocto/attachments/20161108/18311cc4/attachment.pgp>