Return-Path: Received: from mail.windriver.com (mail.windriver.com [147.11.1.11]) by mail.openembedded.org (Postfix) with ESMTP id 4D7EC744F3 for ; Wed, 24 Oct 2018 20:25:47 +0000 (UTC) Received: from ALA-HCB.corp.ad.wrs.com ([147.11.189.41]) by mail.windriver.com (8.15.2/8.15.1) with ESMTPS id w9OKPmfD016565 (version=TLSv1 cipher=AES128-SHA bits=128 verify=FAIL) for ; Wed, 24 Oct 2018 13:25:48 -0700 (PDT) Received: from msp-lpggp1.wrs.com (172.25.34.110) by ALA-HCB.corp.ad.wrs.com (147.11.189.41) with Microsoft SMTP Server id 14.3.408.0; Wed, 24 Oct 2018 13:25:36 -0700 From: Mark Hatle To: Date: Wed, 24 Oct 2018 16:25:35 -0400 Message-ID: <20181024202535.91869-1-mark.hatle@windriver.com> X-Mailer: git-send-email 2.16.0.rc2 MIME-Version: 1.0 Subject: [PATCH v2] weston: Split out machine specific configuration X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Oct 2018 20:25:47 -0000 Content-Type: text/plain 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 --- 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 " RECIPE_MAINTAINER_pn-wayland-protocols = "Denys Dmytriyenko " RECIPE_MAINTAINER_pn-webkitgtk = "Alexander Kanavin " RECIPE_MAINTAINER_pn-weston = "Denys Dmytriyenko " +RECIPE_MAINTAINER_pn-weston-cfg = "Denys Dmytriyenko " RECIPE_MAINTAINER_pn-weston-init = "Denys Dmytriyenko " RECIPE_MAINTAINER_pn-wget = "Yi Zhao " RECIPE_MAINTAINER_pn-which = "Ross Burton " 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