Reworking config creation for lxc and container manager

At "Add initial container manager config for r-car gen3"
add container manager config recipes.  But it is not support
dynamic drm lease configuration, it require to static
configuration in each guest.

This patch enable dynamic drm lease configuration similar
to lxc-config.

Bug-AGL: SPEC-4777

Change-Id: I6161c5ff3d93ddbbde866c1c28d107d8f524d40b
Signed-off-by: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>

10 files changed, 12 insertions, 17 deletions

diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo/system.conf.agl-flutter-ivi-demo.in b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo/system.conf.agl-flutter-ivi-demo.in
index ee7a4103..876597f5 100644
--- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo/system.conf.agl-flutter-ivi-demo.in
+++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo/system.conf.agl-flutter-ivi-demo.in
@@ -1,4 +1,4 @@
 [Manager]
 DefaultEnvironment = DLM_RUNTIME_PATH=/var/display/drm-lease-manager
-DefaultEnvironment = DRM_LEASE_DEVICE=card0-HDMI-A-1
+DefaultEnvironment = DRM_LEASE_DEVICE=@DRM_LEASE_DEVICE@
 DefaultEnvironment = PIPEWIRE_RUNTIME_DIR=/var
diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo_1.0.bb b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo_1.0.bb
index a27e03b6..fb34288a 100644
--- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo_1.0.bb
+++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo_1.0.bb
@@ -6,13 +6,12 @@ SRC_URI = "file://agl-flutter-ivi-demo.json \
            file://system.conf.agl-flutter-ivi-demo.in \
           "
 
-inherit allarch
+inherit cm-config
 
 do_install:append() {
     install -Dm644 ${WORKDIR}/agl-flutter-ivi-demo.json ${D}/opt/container/conf/agl-flutter-ivi-demo.json
     install -d ${D}/opt/container/guests/agl-flutter-ivi-demo/rootfs
     install -d ${D}/opt/container/guests/agl-flutter-ivi-demo/nv
-    install -Dm644 ${WORKDIR}/system.conf.agl-flutter-ivi-demo.in ${D}/opt/container/guests/agl-flutter-ivi-demo/system.conf
 }
 
 FILES:${PN} += " \
diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo/system.conf.agl-html5-ivi-demo.in b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo/system.conf.agl-html5-ivi-demo.in
index ee7a4103..876597f5 100644
--- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo/system.conf.agl-html5-ivi-demo.in
+++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo/system.conf.agl-html5-ivi-demo.in
@@ -1,4 +1,4 @@
 [Manager]
 DefaultEnvironment = DLM_RUNTIME_PATH=/var/display/drm-lease-manager
-DefaultEnvironment = DRM_LEASE_DEVICE=card0-HDMI-A-1
+DefaultEnvironment = DRM_LEASE_DEVICE=@DRM_LEASE_DEVICE@
 DefaultEnvironment = PIPEWIRE_RUNTIME_DIR=/var
diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo_1.0.bb b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo_1.0.bb
index 169ea4e4..e3461578 100644
--- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo_1.0.bb
+++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo_1.0.bb
@@ -6,13 +6,12 @@ SRC_URI = "file://agl-html5-ivi-demo.json \
            file://system.conf.agl-html5-ivi-demo.in \
           "
 
-inherit allarch
+inherit cm-config
 
 do_install:append() {
     install -Dm644 ${WORKDIR}/agl-html5-ivi-demo.json ${D}/opt/container/conf/agl-html5-ivi-demo.json
     install -d ${D}/opt/container/guests/agl-html5-ivi-demo/rootfs
     install -d ${D}/opt/container/guests/agl-html5-ivi-demo/nv
-    install -Dm644 ${WORKDIR}/system.conf.agl-html5-ivi-demo.in ${D}/opt/container/guests/agl-html5-ivi-demo/system.conf
 }
 
 FILES:${PN} += " \
diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo/system.conf.agl-momi-ivi.in b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo/system.conf.agl-momi-ivi-demo.in
index ee7a4103..876597f5 100644
--- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo/system.conf.agl-momi-ivi.in
+++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo/system.conf.agl-momi-ivi-demo.in
@@ -1,4 +1,4 @@
 [Manager]
 DefaultEnvironment = DLM_RUNTIME_PATH=/var/display/drm-lease-manager
-DefaultEnvironment = DRM_LEASE_DEVICE=card0-HDMI-A-1
+DefaultEnvironment = DRM_LEASE_DEVICE=@DRM_LEASE_DEVICE@
 DefaultEnvironment = PIPEWIRE_RUNTIME_DIR=/var
diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo_1.0.bb b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo_1.0.bb
index 1e10c18f..2adfe0c3 100644
--- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo_1.0.bb
+++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo_1.0.bb
@@ -3,16 +3,15 @@ LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9"
 
 SRC_URI = "file://agl-momi-ivi-demo.json \
-           file://system.conf.agl-momi-ivi.in \
+           file://system.conf.agl-momi-ivi-demo.in \
           "
 
-inherit allarch
+inherit cm-config
 
 do_install:append() {
     install -Dm644 ${WORKDIR}/agl-momi-ivi-demo.json ${D}/opt/container/conf/agl-momi-ivi-demo.json
     install -d ${D}/opt/container/guests/agl-momi-ivi-demo/rootfs
     install -d ${D}/opt/container/guests/agl-momi-ivi-demo/nv
-    install -Dm644 ${WORKDIR}/system.conf.agl-momi-ivi.in ${D}/opt/container/guests/agl-momi-ivi-demo/system.conf
 }
 
 FILES:${PN} += " \
diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo/system.conf.agl-qt-ivi.in b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo/system.conf.agl-qt-ivi-demo.in
index ee7a4103..876597f5 100644
--- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo/system.conf.agl-qt-ivi.in
+++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo/system.conf.agl-qt-ivi-demo.in
@@ -1,4 +1,4 @@
 [Manager]
 DefaultEnvironment = DLM_RUNTIME_PATH=/var/display/drm-lease-manager
-DefaultEnvironment = DRM_LEASE_DEVICE=card0-HDMI-A-1
+DefaultEnvironment = DRM_LEASE_DEVICE=@DRM_LEASE_DEVICE@
 DefaultEnvironment = PIPEWIRE_RUNTIME_DIR=/var
diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo_1.0.bb b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo_1.0.bb
index 2dc84b8a..f0550b0c 100644
--- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo_1.0.bb
+++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo_1.0.bb
@@ -3,16 +3,15 @@ LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9"
 
 SRC_URI = "file://agl-qt-ivi-demo.json \
-           file://system.conf.agl-qt-ivi.in \
+           file://system.conf.agl-qt-ivi-demo.in \
           "
 
-inherit allarch
+inherit cm-config
 
 do_install:append() {
     install -Dm644 ${WORKDIR}/agl-qt-ivi-demo.json ${D}/opt/container/conf/agl-qt-ivi-demo.json
     install -d ${D}/opt/container/guests/agl-qt-ivi-demo/rootfs
     install -d ${D}/opt/container/guests/agl-qt-ivi-demo/nv
-    install -Dm644 ${WORKDIR}/system.conf.agl-qt-ivi.in ${D}/opt/container/guests/agl-qt-ivi-demo/system.conf
 }
 
 FILES:${PN} += " \
diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-cluster-demo/system.conf.cluster-demo.in b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-cluster-demo/system.conf.cluster-demo.in
index 28028997..29a49b6c 100644
--- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-cluster-demo/system.conf.cluster-demo.in
+++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-cluster-demo/system.conf.cluster-demo.in
@@ -1,6 +1,6 @@
 [Manager]
 DefaultEnvironment = DLM_RUNTIME_PATH=/var/display/drm-lease-manager
-DefaultEnvironment = DRM_LEASE_DEVICE=card0-HDMI-A-2
+DefaultEnvironment = DRM_LEASE_DEVICE=@DRM_LEASE_DEVICE@
 DefaultEnvironment = QT_QPA_PLATFORM=wayland
 DefaultEnvironment = QT_QPA_PLATFORM_PLUGIN_PATH=/usr/lib/plugins/
 DefaultEnvironment = QML_IMPORT_PATH=/usr/lib/qml/
diff --git a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-cluster-demo_1.0.bb b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-cluster-demo_1.0.bb
index 4417974d..37be4713 100644
--- a/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-cluster-demo_1.0.bb
+++ b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-cluster-demo_1.0.bb
@@ -7,13 +7,12 @@ SRC_URI = "file://cluster-demo.json \
            file://system.conf.cluster-demo.in \
           "
 
-inherit allarch
+inherit cm-config
 
 do_install:append() {
     install -Dm644 ${WORKDIR}/cluster-demo.json ${D}/opt/container/conf/cluster-demo.json
     install -d ${D}/opt/container/guests/cluster-demo/rootfs
     install -d ${D}/opt/container/guests/cluster-demo/nv
-    install -Dm644 ${WORKDIR}/system.conf.cluster-demo.in  ${D}/opt/container/guests/cluster-demo/system.conf
 }
 
 FILES:${PN} += " \