[OE-core] [PATCH v2] weston: Split out machine specific configuration

[Martin Jansa]

You need to add weston-cfg to SIGGEN_EXCLUDERECIPES_ABISAFE otherwise
weston will still be effectively MACHINE_ARCH because of the do_package
signature depending on weston-cfg signature.

On Wed, Oct 24, 2018 at 10:25 PM Mark Hatle <mark.hatle at windriver.com>
wrote:

> Weston needs to be configured to load the fbdev driver when run on a QEMU
> system.
> Other MACHINEs may want to also provider their own configuration as well..
>
> Adding a new RRECOMMEND configuration package will allow this, but avoid
> installing empty packages/files in the majority case where it is not
> needed.
>
> Add maintainer entry as well.
>
> Signed-off-by: Mark Hatle <mark.hatle at windriver.com>
> ---
>  meta/conf/distro/include/maintainers.inc      |  1 +
>  meta/recipes-graphics/wayland/weston-cfg.bb   | 34
> +++++++++++++++++++++++++++
>  meta/recipes-graphics/wayland/weston_5.0.0.bb |  8 +------
>  3 files changed, 36 insertions(+), 7 deletions(-)
>  create mode 100644 meta/recipes-graphics/wayland/weston-cfg.bb
>
> diff --git a/meta/conf/distro/include/maintainers.inc
> b/meta/conf/distro/include/maintainers.inc
> index d32e07d899..5b68336184 100644
> --- a/meta/conf/distro/include/maintainers.inc
> +++ b/meta/conf/distro/include/maintainers.inc
> @@ -678,6 +678,7 @@ RECIPE_MAINTAINER_pn-wayland = "Denys Dmytriyenko <
> denys at ti.com>"
>  RECIPE_MAINTAINER_pn-wayland-protocols = "Denys Dmytriyenko <denys at ti.com
> >"
>  RECIPE_MAINTAINER_pn-webkitgtk = "Alexander Kanavin <
> alex.kanavin at gmail.com>"
>  RECIPE_MAINTAINER_pn-weston = "Denys Dmytriyenko <denys at ti.com>"
> +RECIPE_MAINTAINER_pn-weston-cfg = "Denys Dmytriyenko <denys at ti.com>"
>  RECIPE_MAINTAINER_pn-weston-init = "Denys Dmytriyenko <denys at ti.com>"
>  RECIPE_MAINTAINER_pn-wget = "Yi Zhao <yi.zhao at windriver.com>"
>  RECIPE_MAINTAINER_pn-which = "Ross Burton <ross.burton at intel.com>"
> diff --git a/meta/recipes-graphics/wayland/weston-cfg.bb
> b/meta/recipes-graphics/wayland/weston-cfg.bb
> new file mode 100644
> index 0000000000..6a5cdbf915
> --- /dev/null
> +++ b/meta/recipes-graphics/wayland/weston-cfg.bb
> @@ -0,0 +1,34 @@
> +SUMMARY = "Weston, a Wayland compositor, configuration files"
> +HOMEPAGE = "http://wayland.freedesktop.org"
> +LICENSE = "MIT"
> +LIC_FILES_CHKSUM =
> "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
> +
> +PACKAGE_ARCH = "${MACHINE_ARCH}"
> +
> +CONFFILES_${PN} = "${sysconfdir}/xdg/weston/weston.ini"
> +
> +FILES_${PN} = "${sysconfdir}/xdg/weston/weston.ini"
> +
> +PACKAGES = "${PN}"
> +
> +do_compile[noexec] = '1'
> +
> +do_install() {
> +       :
> +}
> +
> +do_install_qemux86() {
> +       mkdir -p ${D}/${sysconfdir}/xdg/weston
> +       cat << EOF > ${D}/${sysconfdir}/xdg/weston/weston.ini
> +[core]
> +backend=fbdev-backend.so
> +EOF
> +}
> +
> +do_install_qemux86-64() {
> +       mkdir -p ${D}/${sysconfdir}/xdg/weston
> +       cat << EOF > ${D}/${sysconfdir}/xdg/weston/weston.ini
> +[core]
> +backend=fbdev-backend.so
> +EOF
> +}
> diff --git a/meta/recipes-graphics/wayland/weston_5.0.0.bb
> b/meta/recipes-graphics/wayland/weston_5.0.0.bb
> index 299408b201..b87524ece5 100644
> --- a/meta/recipes-graphics/wayland/weston_5.0.0.bb
> +++ b/meta/recipes-graphics/wayland/weston_5.0.0.bb
> @@ -29,12 +29,6 @@ WESTON_MAJOR_VERSION =
> "${@'.'.join(d.getVar('PV').split('.')[0:1])}"
>  EXTRA_OECONF = "--enable-setuid-install \
>                  --disable-rdp-compositor \
>                  "
> -EXTRA_OECONF_append_qemux86 = "\
> -               WESTON_NATIVE_BACKEND=fbdev-backend.so \
> -               "
> -EXTRA_OECONF_append_qemux86-64 = "\
> -               WESTON_NATIVE_BACKEND=fbdev-backend.so \
> -               "
>  PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland',
> 'kms fbdev wayland egl', '', d)} \
>                     ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland',
> 'xwayland', '', d)} \
>                     ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd
> x11', d)} \
> @@ -107,7 +101,7 @@ FILES_${PN}-xwayland =
> "${libdir}/libweston-${WESTON_MAJOR_VERSION}/xwayland.so"
>  RDEPENDS_${PN}-xwayland += "xserver-xorg-xwayland"
>
>  RDEPENDS_${PN} += "xkeyboard-config"
> -RRECOMMENDS_${PN} = "liberation-fonts"
> +RRECOMMENDS_${PN} = "weston-cfg liberation-fonts"
>  RRECOMMENDS_${PN}-dev += "wayland-protocols"
>
>  USERADD_PACKAGES = "${PN}"
> --
> 2.16.0.rc2
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20181024/779ead2d/attachment-0002.html>