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 <[email protected]> --- meta/conf/distro/include/maintainers.inc | 1 + meta/conf/layer.conf | 1 + meta/recipes-graphics/wayland/weston-conf.bb | 35 +++++++++++++++++++++++++++ meta/recipes-graphics/wayland/weston_5.0.0.bb | 8 +----- 4 files changed, 38 insertions(+), 7 deletions(-) create mode 100644 meta/recipes-graphics/wayland/weston-conf.bb diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index d32e07d..1278593 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 <[email protected]>" RECIPE_MAINTAINER_pn-wayland-protocols = "Denys Dmytriyenko <[email protected]>" RECIPE_MAINTAINER_pn-webkitgtk = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER_pn-weston = "Denys Dmytriyenko <[email protected]>" +RECIPE_MAINTAINER_pn-weston-conf = "Denys Dmytriyenko <[email protected]>" RECIPE_MAINTAINER_pn-weston-init = "Denys Dmytriyenko <[email protected]>" RECIPE_MAINTAINER_pn-wget = "Yi Zhao <[email protected]>" RECIPE_MAINTAINER_pn-which = "Ross Burton <[email protected]>" diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf index 504f7fa..c67dec4 100644 --- a/meta/conf/layer.conf +++ b/meta/conf/layer.conf @@ -75,6 +75,7 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ font-alias->font-util \ systemd-boot->systemd-bootconf \ systemd->systemd-conf \ + weston->weston-conf \ weston-init->weston \ weston-init->kbd \ " diff --git a/meta/recipes-graphics/wayland/weston-conf.bb b/meta/recipes-graphics/wayland/weston-conf.bb new file mode 100644 index 0000000..f52200c --- /dev/null +++ b/meta/recipes-graphics/wayland/weston-conf.bb @@ -0,0 +1,35 @@ +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_configure[noexec] = '1' +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 299408b..e517109 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-conf liberation-fonts" RRECOMMENDS_${PN}-dev += "wayland-protocols" USERADD_PACKAGES = "${PN}" -- 1.8.3.1 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
