diff options
| author |   Ronan Le Martret <ronan.lemartret@iot.bzh> | 2017-03-24 11:16:21 +0100 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2017-03-30 07:36:39 +0000 |
| commit | 7d1d7457ff2b71abe95525b26148d5a3e7a42790 (patch) | |
| tree | c7b9796ea099f94da5b879276235fea6077d6bf4 /meta-agl-bsp/recipes-graphics | |
| parent | 64d59ff0e0e835a53445b07257d3896fb48abfb5 (diff) | |
Generate weston.ini dynamically
* remove weston-intel.ini
* add new package weston-ini-conf
* the list of the sections of weston.ini is described in variable flags WESTONSECTION
* each section is described in variable flags WESTONSECTION
* each output screen is described in agl_screen variable
Bug-AGL: SPEC-477
Change-Id: I3d25ab49018e3842c916993ba8b9bcc2428d5170
Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
Diffstat (limited to 'meta-agl-bsp/recipes-graphics')
| -rw-r--r-- | meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf.bbappend | 17 | ||||
| -rw-r--r-- | meta-agl-bsp/recipes-graphics/wayland/weston_%.bbappend | 21 |
2 files changed, 17 insertions, 21 deletions
diff --git a/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf.bbappend b/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf.bbappend new file mode 100644 index 000000000..dba2ad6b2 --- /dev/null +++ b/meta-agl-bsp/recipes-graphics/wayland/weston-ini-conf.bbappend @@ -0,0 +1,17 @@ +# OVERRIDES save us some c'n'p below ... +OVERRIDES_prepend_qemux86 = "customwestonini:" +OVERRIDES_prepend_qemux86-64 = "customwestonini:" +# intel-corei7-64 ?? + +python() { + if "customwestonini" in d.getVar("OVERRIDES", True).split(":"): + # DRM backend disabled for now to allow compatibility with VirtualBox + # and VMWare Player. It may be re-enabled if running on QEMU for + # potentially increased performance. + #backend=drm-backend.so + d.delVarFlag("WESTONCORE", "backend") + + d.setVarFlag("WESTONOUTPUT1","agl_screen", "SCREEN_QEMU") +} + + diff --git a/meta-agl-bsp/recipes-graphics/wayland/weston_%.bbappend b/meta-agl-bsp/recipes-graphics/wayland/weston_%.bbappend index b117ada46..9aaea5f69 100644 --- a/meta-agl-bsp/recipes-graphics/wayland/weston_%.bbappend +++ b/meta-agl-bsp/recipes-graphics/wayland/weston_%.bbappend @@ -1,24 +1,3 @@ -FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" - RDEPENDS_${PN}_append_qemux86 = " mesa-megadriver" RDEPENDS_${PN}_append_qemux86-64 = " mesa-megadriver" RDEPENDS_${PN}_append_intel-corei7-64 = " mesa-megadriver" - -# OVERRIDES save us some c'n'p below ... -OVERRIDES_prepend_qemux86 = "customwestonini:" -OVERRIDES_prepend_qemux86-64 = "customwestonini:" -# intel-corei7-64 ?? - -SRC_URI_append_customwestonini = "\ - file://weston-qemu-drm.ini \ - " - -do_install_append_customwestonini() { - WESTON_CONFIG_DIR=${sysconfdir}/xdg/weston - install -d ${D}${WESTON_CONFIG_DIR} - install -m 0644 ${WORKDIR}/weston-qemu-drm.ini ${D}${WESTON_CONFIG_DIR}/weston.ini -} - -FILES_${PN}_append_customwestonini = " \ - ${sysconfdir}/xdg/weston/weston.ini \ - " |