ic-container: qemu: Set connector name for IVI layer manaager

The ivi-layer manager configuration file needs to know the name
of display connector to set up the layer configuration.

Adjust the connector name in the configuration file to reflect
the connector names in us on the platform being built.  This
currently only applies to qemu, but could be applied to other
build configurations in future.

Bug-AGL: SPEC-4464

Change-Id: Ie52c9b8639a2bd5c83c4686ff9b557d05a2a7e1e
Signed-off-by: Damian Hobson-Garcia <dhobsong@igel.co.jp>

diff --git a/meta-agl-ic-container/recipes-demo/ilm-manager/ilm-manager/agl.json b/meta-agl-ic-container/recipes-demo/ilm-manager/ilm-manager/agl.json.in
similarity index 96%
rename from meta-agl-ic-container/recipes-demo/ilm-manager/ilm-manager/agl.json
rename to meta-agl-ic-container/recipes-demo/ilm-manager/ilm-manager/agl.json.in
index 80028c5..c241b78 100644 (file)
--- a/meta-agl-ic-container/recipes-demo/ilm-manager/ilm-manager/agl.json
+++ b/meta-agl-ic-container/recipes-demo/ilm-manager/ilm-manager/agl.json.in
@@ -2,7 +2,7 @@
        "screen": [
                {
                        "name": "ivi-screen",
-                       "dispname": "HDMI-A-1"
+                       "dispname": "@DRM_IVI_DEVICE@"
                }
        ],
        "layer": [

diff --git a/meta-agl-ic-container/recipes-demo/ilm-manager/ilm-manager_git.bb b/meta-agl-ic-container/recipes-demo/ilm-manager/ilm-manager_git.bb
index 2f976b3..072613f 100644 (file)
--- a/meta-agl-ic-container/recipes-demo/ilm-manager/ilm-manager_git.bb
+++ b/meta-agl-ic-container/recipes-demo/ilm-manager/ilm-manager_git.bb
@@ -10,17 +10,24 @@ PV = "0.1.0+rev${SRCPV}"
 SRCREV = "e3a33d47195e4656f7117753d27a0f2d6b21aab9"
 SRC_URI = " \
     git://github.com/AGLExport/ilm-manager.git;branch=master;protocol=https \
-    file://agl.json \
+    file://agl.json.in \
     file://ilm-manager.service \
     "
 S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig systemd
 
+DRM_IVI_DEVICE = "HDMI-A-1"
+DRM_IVI_DEVICE:qemuall = "Virtual-1"
+
 do_install:append() {
     #install scripts
+
+    sed 's|@DRM_IVI_DEVICE@|${DRM_IVI_DEVICE}|g' \
+         ${WORKDIR}/agl.json.in > ${B}/agl.json
+
     install -d ${D}${sysconfdir}
-    install -m 0644 ${WORKDIR}/agl.json ${D}${sysconfdir}
+    install -m 0644 ${B}/agl.json ${D}${sysconfdir}
 
     install -d ${D}/${systemd_system_unitdir}
     install -m 0644 ${WORKDIR}/ilm-manager.service ${D}${systemd_system_unitdir}