meta-agl-core: Revise weston-ini-conf mechanism

The recent layer reorganization broke the landscape vs portrait scheme
based on bbappend'ing the weston-ini-conf recipe in the previous cluster
and html5 demo layers.  To fix this and to facilitate being able to
easily build the mix of demo platform images, the weston.ini generation
mechanism in the weston-ini-conf has been revised to build multiple
packages.

Instead of relying on SRC_URI to install weston.ini fragments into
WORKDIR and grabbing all of them with a *.cfg glob, an explicit list
built from new WESTON_FRAGMENTS and WESTON_DISPLAYS variables is used.
The fragments listed in WESTON_FRAGMENTS are used to generate both
weston-ini-conf and weston-ini-conf-landscape packages containing
uniquely named files (weston.ini.default and weston.ini.landscape,
respectively), and the OE update-alternatives mechanism is used to have
weston.ini point at the appropriate file on installation.  For now, the
two packages are explicitly marked as incompatible with one another,
but this could be tweaked in the future if switching between them on
target is desired.

Additional notes:
- A RPROVIDES of "weston-ini" has been defined for the weston-ini-conf
  packages and a RDEPENDS on it added to weston-init.  This should
  allow members to drop in a complete alternative solution while still
  having a dependency chain.
- The various meta-agl-bsp bbappends of weston-ini-conf have for the
  most part been updated to yield the same behavior as before, though
  with an eye towards using machine overrides to ease multiconfig usage
  down the road.  This includes the currently unused Raspberry Pi
  touchscreen support, which has been left since it may still see use.
- An exception to the above, however, is that the support for the
  touchscreen on the dra7 EVM has been removed, as upstream dropped the
  support for the screen on the available test hardware and at present
  it only seems feasible to support external HDMI monitors.
- The unused fbdev fragment used to support meta-freescale in the past
  has been removed.
- The virtual and virtual-landscape fragments have been renamed to
  virtual-270 and virtual-0 to better indicate the orientation and match
  the naming used for the other fragments.  It is likely that future
  work will need to split the display enabling and orientation aspects,
  as the current tying together of the two results in configurations
  somewhat overly specific to the actual AGL demo systems.

Bug-AGL: SPEC-3745

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I2a968781182a346c1d483cca4fd7337679e58118
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/25860
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>

5 files changed, 13 insertions, 23 deletions

diff --git a/meta-agl-bsp/meta-freescale-layer/recipes-graphics/wayland/weston-ini-conf/fbdev.cfg b/meta-agl-bsp/meta-freescale-layer/recipes-graphics/wayland/weston-ini-conf/fbdev.cfg
deleted file mode 100644
index b1a1f3cc9..000000000
--- a/meta-agl-bsp/meta-freescale-layer/recipes-graphics/wayland/weston-ini-conf/fbdev.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-[output]
-name=fbdev
-transform=270
diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-graphics/wayland/weston-ini-conf.bbappend b/meta-agl-bsp/meta-raspberrypi/recipes-graphics/wayland/weston-ini-conf.bbappend
index 33dfd6a23..086fff751 100644
--- a/meta-agl-bsp/meta-raspberrypi/recipes-graphics/wayland/weston-ini-conf.bbappend
+++ b/meta-agl-bsp/meta-raspberrypi/recipes-graphics/wayland/weston-ini-conf.bbappend
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend_raspberrypi := "${THISDIR}/${PN}:"
 
-SRC_URI += "file://dsi.cfg"
+SRC_URI_append_raspberrypi = " file://dsi.cfg"
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 44615c331..2fd50c3d9 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,12 +1,15 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend_rcar-gen3 := "${THISDIR}/${PN}:"
 
-SRC_URI_append_ulcb = " file://kingfisher_output.cfg"
-SRC_URI_append_ebisu = " file://ebisu_output.cfg"
-SRC_URI_append_salvator-x = " file://salvator-x_output.cfg"
+SRC_URI_append_rcar-gen3 = " \
+	file://kingfisher_output.cfg \
+	file://ebisu_output.cfg \
+	file://salvator-x_output.cfg \
+"
 
-do_configure() {
-    echo repaint-window=34 >> ${WORKDIR}/core.cfg
+WESTON_FRAGMENTS_append_ulcb = " kingfisher_output"
+WESTON_FRAGMENTS_append_ebisu = " ebisu_output"
+WESTON_FRAGMENTS_append_salvator-x = " salvator-x_output"
 
-    echo transition-duration=300 >> ${WORKDIR}/ivishell.cfg
-    echo cursor-theme=default >> ${WORKDIR}/ivishell.cfg
+do_configure_append_rcar-gen3() {
+    echo repaint-window=34 >> ${WORKDIR}/core.cfg
 }
diff --git a/meta-agl-bsp/meta-ti/recipes-graphics/wayland/weston-ini-conf.bbappend b/meta-agl-bsp/meta-ti/recipes-graphics/wayland/weston-ini-conf.bbappend
deleted file mode 100644
index 684031eae..000000000
--- a/meta-agl-bsp/meta-ti/recipes-graphics/wayland/weston-ini-conf.bbappend
+++ /dev/null
@@ -1,7 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-# While we could have a panel attached to HDMI, we only use the default
-# panel isntead.
-SRC_URI_remove_dra7xx-evm = "file://hdmi-a-1-270.cfg"
-# Our DPI panel shows up as "UNNAMED-1"
-SRC_URI_append_dra7xx-evm = " file://unnamed.cfg"
diff --git a/meta-agl-bsp/meta-ti/recipes-graphics/wayland/weston-ini-conf/unnamed.cfg b/meta-agl-bsp/meta-ti/recipes-graphics/wayland/weston-ini-conf/unnamed.cfg
deleted file mode 100644
index 29544932e..000000000
--- a/meta-agl-bsp/meta-ti/recipes-graphics/wayland/weston-ini-conf/unnamed.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-[output]
-name=UNNAMED-1
-transform=270