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>

16 files changed, 27 insertions, 174 deletions

diff --git a/meta-agl-bsp/meta-intel/recipes-graphics/wayland/weston/weston-intel.ini b/meta-agl-bsp/meta-intel/recipes-graphics/wayland/weston/weston-intel.ini
deleted file mode 100644
index 9cb7df328..000000000
--- a/meta-agl-bsp/meta-intel/recipes-graphics/wayland/weston/weston-intel.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-[core]
-# shell=desktop-shell.so
-backend=drm-backend.so
-shell=ivi-shell.so
-
-[ivi-shell]
-ivi-module=ivi-controller.so
-ivi-input-module=ivi-input-controller.so
-
-[shell]
-locking=true
-# Uncomment below to hide panel
-#panel-location=none
-
-[output]
-name=HDMI-A-1
-transform=90
-
-#[output]
-#name=HDMI1
-#transform=90
diff --git a/meta-agl-bsp/meta-intel/recipes-graphics/wayland/weston_%.bbappend b/meta-agl-bsp/meta-intel/recipes-graphics/wayland/weston_%.bbappend
deleted file mode 100644
index 19e634735..000000000
--- a/meta-agl-bsp/meta-intel/recipes-graphics/wayland/weston_%.bbappend
+++ /dev/null
@@ -1,15 +0,0 @@
-FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
-
-SRC_URI_append = "\
-    file://weston-intel.ini \
-    "
-
-do_install_append() {
-    WESTON_INI_CONFIG=${sysconfdir}/xdg/weston
-    install -d ${D}${WESTON_INI_CONFIG}
-    install -m 0644 ${WORKDIR}/weston-intel.ini ${D}${WESTON_INI_CONFIG}/weston.ini
-}
-
-FILES_${PN} += " \
-    ${sysconfdir}/xdg/weston/weston.ini \
-    "
diff --git a/meta-agl-bsp/meta-qcom/recipes-graphics/wayland/weston/weston-qcom.ini b/meta-agl-bsp/meta-qcom/recipes-graphics/wayland/weston/weston-qcom.ini
deleted file mode 100644
index 30eccc3d9..000000000
--- a/meta-agl-bsp/meta-qcom/recipes-graphics/wayland/weston/weston-qcom.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-[core]
-backend=drm-backend.so
-shell=ivi-shell.so
-
-[ivi-shell]
-ivi-module=ivi-controller.so
-ivi-input-module=ivi-input-controller.so
-
-[output]
-name=HDMI-A-1
-transform=270
-# Uncomment for 1080p on GeChic 1502i:
-#mode=173.00 1920 2048 2248 2576 1080 1083 1088 1120 -hsync +vsync
diff --git a/meta-agl-bsp/meta-qcom/recipes-graphics/wayland/weston_%.bbappend b/meta-agl-bsp/meta-qcom/recipes-graphics/wayland/weston_%.bbappend
index 8fff1dfe7..f8c0a5fa3 100644
--- a/meta-agl-bsp/meta-qcom/recipes-graphics/wayland/weston_%.bbappend
+++ b/meta-agl-bsp/meta-qcom/recipes-graphics/wayland/weston_%.bbappend
@@ -1,20 +1,14 @@
 FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
 
 SRC_URI_append = "\
-    file://weston-qcom.ini \
     file://weston.sh \
     "
 
 do_install_append() {
-    WESTON_INI_CONFIG=${sysconfdir}/xdg/weston
-    install -d ${D}${WESTON_INI_CONFIG}
-    install -m 0644 ${WORKDIR}/weston-qcom.ini ${D}${WESTON_INI_CONFIG}/weston.ini
-
     install -d ${D}/${sysconfdir}/profile.d
     install -m 0755 ${WORKDIR}/weston.sh ${D}/${sysconfdir}/profile.d/weston.sh
 }
 
 FILES_${PN} += " \
-    ${sysconfdir}/xdg/weston/weston.ini \
     ${sysconfdir}/profile.d/weston.sh \
     "
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
new file mode 100644
index 000000000..14b858d45
--- /dev/null
+++ b/meta-agl-bsp/meta-raspberrypi/recipes-graphics/wayland/weston-ini-conf.bbappend
@@ -0,0 +1,4 @@
+# Disable LVDS
+WESTONOUTPUT2[agl_screen] ??= "SCREEN_DSI"
+
+WESTONSECTION[WESTONOUTPUT2] = "output"
diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-graphics/wayland/weston/weston-raspberrypi.ini b/meta-agl-bsp/meta-raspberrypi/recipes-graphics/wayland/weston/weston-raspberrypi.ini
deleted file mode 100644
index 15721e3dc..000000000
--- a/meta-agl-bsp/meta-raspberrypi/recipes-graphics/wayland/weston/weston-raspberrypi.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[core]
-backend=drm-backend.so
-shell=ivi-shell.so
-
-[ivi-shell]
-ivi-module=ivi-controller.so
-ivi-input-module=ivi-input-controller.so
-
-# HDMI / GeChic
-[output]
-name=HDMI-A-1
-transform=270
-# Uncomment for 1080p on GeChic 1502i:
-#mode=173.00 1920 2048 2248 2576 1080 1083 1088 1120 -hsync +vsync
-
-# official touchscreen over DSI interface
-[output]
-name=DSI-1
-transform=270
diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-graphics/wayland/weston_%.bbappend b/meta-agl-bsp/meta-raspberrypi/recipes-graphics/wayland/weston_%.bbappend
index 7c8167961..f8c0a5fa3 100644
--- a/meta-agl-bsp/meta-raspberrypi/recipes-graphics/wayland/weston_%.bbappend
+++ b/meta-agl-bsp/meta-raspberrypi/recipes-graphics/wayland/weston_%.bbappend
@@ -1,20 +1,14 @@
 FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
 
 SRC_URI_append = "\
-    file://weston-raspberrypi.ini \
     file://weston.sh \
     "
 
 do_install_append() {
-    WESTON_INI_CONFIG=${sysconfdir}/xdg/weston
-    install -d ${D}${WESTON_INI_CONFIG}
-    install -m 0644 ${WORKDIR}/weston-raspberrypi.ini ${D}${WESTON_INI_CONFIG}/weston.ini
-
     install -d ${D}/${sysconfdir}/profile.d
     install -m 0755 ${WORKDIR}/weston.sh ${D}/${sysconfdir}/profile.d/weston.sh
 }
 
 FILES_${PN} += " \
-    ${sysconfdir}/xdg/weston/weston.ini \
     ${sysconfdir}/profile.d/weston.sh \
     "
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
new file mode 100644
index 000000000..de8d9552c
--- /dev/null
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf.bbappend
@@ -0,0 +1 @@
+WESTONCORE[repaint-window] ??= "34"
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston/weston-rcar.ini b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston/weston-rcar.ini
deleted file mode 100644
index a37895c9c..000000000
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston/weston-rcar.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-[core]
-shell=ivi-shell.so
-backend=drm-backend.so
-repaint-window=34
-
-[ivi-shell]
-ivi-module=ivi-controller.so
-
-[output]
-name=HDMI-A-1
-transform=90
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston_%.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston_%.bbappend
index 98b973caa..079ff496a 100644
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston_%.bbappend
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston_%.bbappend
@@ -1,15 +1,3 @@
-FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
-
-SRC_URI_append = "\
-    file://weston-rcar.ini \
-    "
-
-do_install_append() {
-    WESTON_INI_CONFIG=${sysconfdir}/xdg/weston
-    install -d ${D}${WESTON_INI_CONFIG}
-    install -m 0644 ${WORKDIR}/weston-rcar.ini ${D}${WESTON_INI_CONFIG}/weston.ini
-}
-
 FILES_${PN}_append_rcar-gen3 = " \
     ${libexecdir}/weston-screenshooter \
     ${libexecdir}/weston-ivi-shell-user-interface \
@@ -17,7 +5,3 @@ FILES_${PN}_append_rcar-gen3 = " \
     ${libexecdir}/weston-simple-im \
     ${libexecdir}/weston-desktop-shell \
 "
-
-FILES_${PN}_append = " \
-    ${sysconfdir}/xdg/weston/weston.ini \
-    "
diff --git a/meta-agl-bsp/meta-renesas/recipes-graphics/wayland/weston-ini-conf.bbappend b/meta-agl-bsp/meta-renesas/recipes-graphics/wayland/weston-ini-conf.bbappend
new file mode 100644
index 000000000..7a54dfbe4
--- /dev/null
+++ b/meta-agl-bsp/meta-renesas/recipes-graphics/wayland/weston-ini-conf.bbappend
@@ -0,0 +1,5 @@
+# Disable LVDS
+WESTONOUTPUT2[name] = "LVDS-1"
+WESTONOUTPUT2[mode] = "off"
+
+WESTONSECTION[WESTONOUTPUT2] = "output"
diff --git a/meta-agl-bsp/meta-renesas/recipes-graphics/wayland/weston/weston-renesas.ini b/meta-agl-bsp/meta-renesas/recipes-graphics/wayland/weston/weston-renesas.ini
deleted file mode 100644
index 6e1c624c3..000000000
--- a/meta-agl-bsp/meta-renesas/recipes-graphics/wayland/weston/weston-renesas.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-[core]
-backend=drm-backend.so
-shell=ivi-shell.so
-
-[ivi-shell]
-ivi-module=ivi-controller.so
-ivi-input-module=ivi-input-controller.so
-
-[output]
-name=HDMI-A-1
-transform=270
-#mode=173.00  1920 2048 2248 2576  1080 1083 1088 1120 -hsync +vsync
-#mode=1920x1080
-#mode=1024x768
-#transform=90
-
-[output]
-# Disable LVDS
-name=LVDS-1
-mode=off
diff --git a/meta-agl-bsp/meta-renesas/recipes-graphics/wayland/weston_%.bbappend b/meta-agl-bsp/meta-renesas/recipes-graphics/wayland/weston_%.bbappend
deleted file mode 100644
index 842c380a0..000000000
--- a/meta-agl-bsp/meta-renesas/recipes-graphics/wayland/weston_%.bbappend
+++ /dev/null
@@ -1,15 +0,0 @@
-FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
-
-SRC_URI_append = "\
-    file://weston-renesas.ini \
-    "
-
-do_install_append() {
-    WESTON_INI_CONFIG=${sysconfdir}/xdg/weston
-    install -d ${D}${WESTON_INI_CONFIG}
-    install -m 0644 ${WORKDIR}/weston-renesas.ini ${D}${WESTON_INI_CONFIG}/weston.ini
-}
-
-FILES_${PN} += " \
-    ${sysconfdir}/xdg/weston/weston.ini \
-    "
diff --git a/meta-agl-bsp/meta-ti/recipes-arago/weston/weston/dra7xx-evm/weston.ini b/meta-agl-bsp/meta-ti/recipes-arago/weston/weston/dra7xx-evm/weston.ini
deleted file mode 100644
index da2b61dcc..000000000
--- a/meta-agl-bsp/meta-ti/recipes-arago/weston/weston/dra7xx-evm/weston.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-[core]
-backend=drm-backend.so
-shell=ivi-shell.so
-
-[ivi-shell]
-ivi-module=ivi-controller.so
-ivi-input-module=ivi-input-controller.so
-
-[output]
-name=Unknown-1
-transform=270
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 \
-    "