diff options
| author |   Tom Rini <trini@konsulko.com> | 2017-10-18 09:38:05 -0400 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2017-10-20 22:18:30 +0000 |
| commit | 7f8b394a694491ffd94874c26fa83057efaa0dfc (patch) | |
| tree | 0b845d3a5bece2d0985e01b1eed0f2aa86060177 /meta-agl-bsp/meta-rcar-gen3/recipes-graphics | |
| parent | 1c09a2155d1c5fe1701d33cc2567ebb53d7069b3 (diff) | |
weston-ini-conf: Rework to use fragments to construct weston.ini
Switch to constructing the weston.ini from fragments of files instead of
variables and variable flags. This allows for much easier tracking of
signatures by leveraging existing mechanisms. Update the Readme to
explain how to do the various operations with fragments as well. Note
that for QEMU we do not need to pass -show-cursor as it's already
provided and we do want to change the VGA driver to one that reliably
provides DRM support.
For the HDMI connected screens, rather than name them by vendor name
them first for connection and then required transformation for correct
orientation.
For board-specific options, move them to the board directories.
When we need to change existing cfg options, rather than replace them
the proper location to do this in is the do_configure function.
Bug-AGL: SPEC-964
Change-Id: I2cceb4fd64f51eb2ab1d47419b77153cf02d7c12
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/11375
Reviewed-by: Stéphane Desneux <stephane.desneux@iot.bzh>
Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-boot-test: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'meta-agl-bsp/meta-rcar-gen3/recipes-graphics')
| -rw-r--r-- | meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf.bbappend | 16 | ||||
| -rw-r--r-- | meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf/v4l2-renderer.cfg | 3 |
2 files changed, 9 insertions, 10 deletions
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf.bbappend index 661af2b92..78be21187 100644 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf.bbappend +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf.bbappend @@ -1,14 +1,10 @@ -WESTONCORE[repaint-window] ??= "34" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -WESTONIVISHELL[transition-duration] ??= "300" -WESTONIVISHELL[cursor-theme] ??= "default" +SRC_URI += "${@bb.utils.contains("MACHINE_FEATURES", "multimedia", "file://v4l2-renderer.cfg", "",d)}" -WESTONV4L2RENDERER[device] ??= "/dev/media0" -WESTONV4L2RENDERER[device-module] ??= "vsp2" +do_configure() { + echo repaint-window=34 >> ${WORKDIR}/core.cfg -python() { - if "multimedia" in d.getVar("MACHINE_FEATURES", True).split(" "): - d.setVarFlag("WESTONSECTION", "WESTONV4L2RENDERER", "v4l2-renderer") + echo transition-duration=300 >> ${WORKDIR}/ivishell.cfg + echo cursor-theme=default >> ${WORKDIR}/ivishell.cfg } - -do_generate_weston_init[vardeps] += "WESTONIVISHELL WESTONV4L2RENDERER" diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf/v4l2-renderer.cfg b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf/v4l2-renderer.cfg new file mode 100644 index 000000000..135f2303c --- /dev/null +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf/v4l2-renderer.cfg @@ -0,0 +1,3 @@ +[v4l2-renderer] +device=/dev/media0 +device-module=vsp2 |