From 32d1047a23d63a9a135b1a7e91baef433bfd7b05 Mon Sep 17 00:00:00 2001
From: Damian Hobson-Garcia <dhobsong@igel.co.jp>
Date: Mon, 3 Apr 2023 16:35:13 -0400
Subject: 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>
---
 .../recipes-demo/ilm-manager/ilm-manager/agl.json  | 70 ----------------------
 .../ilm-manager/ilm-manager/agl.json.in            | 70 ++++++++++++++++++++++
 .../recipes-demo/ilm-manager/ilm-manager_git.bb    | 11 +++-
 3 files changed, 79 insertions(+), 72 deletions(-)
 delete mode 100644 meta-agl-ic-container/recipes-demo/ilm-manager/ilm-manager/agl.json
 create mode 100644 meta-agl-ic-container/recipes-demo/ilm-manager/ilm-manager/agl.json.in

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
deleted file mode 100644
index 80028c50..00000000
--- a/meta-agl-ic-container/recipes-demo/ilm-manager/ilm-manager/agl.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-	"screen": [
-		{
-			"name": "ivi-screen",
-			"dispname": "HDMI-A-1"
-		}
-	],
-	"layer": [
-		{
-			"name": "ivi-layer",
-			"id": 2000,
-			"width": 1920,
-			"height": 1080,
-			"x": 0,
-			"y": 0,
-			"z": 10,
-			"attach": "ivi-screen"
-		}
-	],
-	"surface": [
-		{
-			"name": "momiscreen",
-			"id": 2000,
-			"x": 0,
-			"y": 988,
-			"z": 10,
-			"attach": "ivi-layer"
-		},
-		{
-			"name": "mominavi",
-			"id": 2010,
-			"x": 0,
-			"y": 0,
-			"z": 100,
-			"attach": "ivi-layer"
-		},
-		{
-			"name": "momiplay",
-			"id": 2011,
-			"x": 0,
-			"y": 0,
-			"z": 110,
-			"attach": "ivi-layer"
-		},
-		{
-			"name": "momiradio",
-			"id": 2012,
-			"x": 0,
-			"y": 0,
-			"z": 120,
-			"attach": "ivi-layer"
-		},
-		{
-			"name": "momisetting",
-			"id": 2013,
-			"x": 0,
-			"y": 0,
-			"z": 130,
-			"attach": "ivi-layer"
-		},
-		{
-			"name": "xdg-test",
-			"id": 9801,
-			"x": 0,
-			"y": 0,
-			"z": 300,
-			"attach": "ivi-layer"
-		}
-	]
-}
diff --git a/meta-agl-ic-container/recipes-demo/ilm-manager/ilm-manager/agl.json.in b/meta-agl-ic-container/recipes-demo/ilm-manager/ilm-manager/agl.json.in
new file mode 100644
index 00000000..c241b788
--- /dev/null
+++ b/meta-agl-ic-container/recipes-demo/ilm-manager/ilm-manager/agl.json.in
@@ -0,0 +1,70 @@
+{
+	"screen": [
+		{
+			"name": "ivi-screen",
+			"dispname": "@DRM_IVI_DEVICE@"
+		}
+	],
+	"layer": [
+		{
+			"name": "ivi-layer",
+			"id": 2000,
+			"width": 1920,
+			"height": 1080,
+			"x": 0,
+			"y": 0,
+			"z": 10,
+			"attach": "ivi-screen"
+		}
+	],
+	"surface": [
+		{
+			"name": "momiscreen",
+			"id": 2000,
+			"x": 0,
+			"y": 988,
+			"z": 10,
+			"attach": "ivi-layer"
+		},
+		{
+			"name": "mominavi",
+			"id": 2010,
+			"x": 0,
+			"y": 0,
+			"z": 100,
+			"attach": "ivi-layer"
+		},
+		{
+			"name": "momiplay",
+			"id": 2011,
+			"x": 0,
+			"y": 0,
+			"z": 110,
+			"attach": "ivi-layer"
+		},
+		{
+			"name": "momiradio",
+			"id": 2012,
+			"x": 0,
+			"y": 0,
+			"z": 120,
+			"attach": "ivi-layer"
+		},
+		{
+			"name": "momisetting",
+			"id": 2013,
+			"x": 0,
+			"y": 0,
+			"z": 130,
+			"attach": "ivi-layer"
+		},
+		{
+			"name": "xdg-test",
+			"id": 9801,
+			"x": 0,
+			"y": 0,
+			"z": 300,
+			"attach": "ivi-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 2f976b39..072613fc 100644
--- 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}
-- 
cgit 1.2.3-korg