From 839dcdeb3073c094bf171d7107d81955feeb3dea Mon Sep 17 00:00:00 2001 From: Naoto Yamaguchi Date: Thu, 4 May 2023 20:56:06 +0900 Subject: 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 --- .../system.conf.agl-flutter-ivi-demo.in | 4 ---- .../cm-config-agl-flutter-ivi-demo_%.bbappend | 23 ++-------------------- .../system.conf.agl-html5-ivi-demo.in | 4 ---- .../cm-config-agl-html5-ivi-demo_%.bbappend | 23 ++-------------------- .../system.conf.agl-momi-ivi.in | 4 ---- .../system.conf.agl-qt-ivi.in | 4 ---- .../cm-config-agl-qt-ivi-demo_%.bbappend | 23 ++-------------------- .../system.conf.cluster-demo.in | 8 -------- .../cm-config-cluster-demo_%.bbappend | 5 +++++ .../lxc-config-cluster-demo_1.0.bbappend | 2 +- .../lxc-config/lxc-config-ivi-demo_1.0.bbappend | 2 +- .../recipes-container/lxc-config/multi-display.inc | 3 --- 12 files changed, 13 insertions(+), 92 deletions(-) delete mode 100644 meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo/system.conf.agl-flutter-ivi-demo.in delete mode 100644 meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo/system.conf.agl-html5-ivi-demo.in delete mode 100644 meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo/system.conf.agl-momi-ivi.in delete mode 100644 meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo/system.conf.agl-qt-ivi.in delete mode 100644 meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-cluster-demo/system.conf.cluster-demo.in delete mode 100644 meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/multi-display.inc (limited to 'meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container') diff --git a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo/system.conf.agl-flutter-ivi-demo.in b/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo/system.conf.agl-flutter-ivi-demo.in deleted file mode 100644 index ee7a4103..00000000 --- a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo/system.conf.agl-flutter-ivi-demo.in +++ /dev/null @@ -1,4 +0,0 @@ -[Manager] -DefaultEnvironment = DLM_RUNTIME_PATH=/var/display/drm-lease-manager -DefaultEnvironment = DRM_LEASE_DEVICE=card0-HDMI-A-1 -DefaultEnvironment = PIPEWIRE_RUNTIME_DIR=/var diff --git a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo_%.bbappend b/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo_%.bbappend index 1301f1d3..bd73278b 100644 --- a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo_%.bbappend +++ b/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo_%.bbappend @@ -1,21 +1,2 @@ -DESCRIPTION = "AGL flutter IVI demo container config" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9" - -SRC_URI = "file://agl-flutter-ivi-demo.json \ - file://system.conf.agl-flutter-ivi-demo.in \ - " - -inherit allarch - -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} += " \ - /opt/container/conf/* \ - /opt/container/guests/agl-flutter-ivi-demo/* \ - " +# Container Manager config for AGL flutter IVI demo on R-Car Gen3 +FILESEXTRAPATHS:prepend := "${THISDIR}/cm-config-agl-flutter-ivi-demo:" diff --git a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo/system.conf.agl-html5-ivi-demo.in b/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo/system.conf.agl-html5-ivi-demo.in deleted file mode 100644 index ee7a4103..00000000 --- a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo/system.conf.agl-html5-ivi-demo.in +++ /dev/null @@ -1,4 +0,0 @@ -[Manager] -DefaultEnvironment = DLM_RUNTIME_PATH=/var/display/drm-lease-manager -DefaultEnvironment = DRM_LEASE_DEVICE=card0-HDMI-A-1 -DefaultEnvironment = PIPEWIRE_RUNTIME_DIR=/var diff --git a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo_%.bbappend b/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo_%.bbappend index 596e4997..e810a7f0 100644 --- a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo_%.bbappend +++ b/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo_%.bbappend @@ -1,21 +1,2 @@ -DESCRIPTION = "AGL HTML5 IVI demo container config" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9" - -SRC_URI = "file://agl-html5-ivi-demo.json \ - file://system.conf.agl-html5-ivi-demo.in \ - " - -inherit allarch - -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} += " \ - /opt/container/conf/* \ - /opt/container/guests/agl-html5-ivi-demo/* \ - " +# Container Manager config for AGL HTML5 IVI demo on R-Car Gen3 +FILESEXTRAPATHS:prepend := "${THISDIR}/cm-config-agl-html5-ivi-demo:" diff --git a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo/system.conf.agl-momi-ivi.in b/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo/system.conf.agl-momi-ivi.in deleted file mode 100644 index ee7a4103..00000000 --- a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo/system.conf.agl-momi-ivi.in +++ /dev/null @@ -1,4 +0,0 @@ -[Manager] -DefaultEnvironment = DLM_RUNTIME_PATH=/var/display/drm-lease-manager -DefaultEnvironment = DRM_LEASE_DEVICE=card0-HDMI-A-1 -DefaultEnvironment = PIPEWIRE_RUNTIME_DIR=/var diff --git a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo/system.conf.agl-qt-ivi.in b/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo/system.conf.agl-qt-ivi.in deleted file mode 100644 index ee7a4103..00000000 --- a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo/system.conf.agl-qt-ivi.in +++ /dev/null @@ -1,4 +0,0 @@ -[Manager] -DefaultEnvironment = DLM_RUNTIME_PATH=/var/display/drm-lease-manager -DefaultEnvironment = DRM_LEASE_DEVICE=card0-HDMI-A-1 -DefaultEnvironment = PIPEWIRE_RUNTIME_DIR=/var diff --git a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo_%.bbappend b/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo_%.bbappend index 3b998456..9c0ff8c2 100644 --- a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo_%.bbappend +++ b/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo_%.bbappend @@ -1,21 +1,2 @@ -DESCRIPTION = "AGL Qt IVI demo container config" -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 \ - " - -inherit allarch - -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} += " \ - /opt/container/conf/* \ - /opt/container/guests/agl-qt-ivi-demo/* \ - " +# Container Manager config for AGL Qt IVI demo on R-Car Gen3 +FILESEXTRAPATHS:prepend := "${THISDIR}/cm-config-agl-qt-ivi-demo:" diff --git a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-cluster-demo/system.conf.cluster-demo.in b/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-cluster-demo/system.conf.cluster-demo.in deleted file mode 100644 index 28028997..00000000 --- a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-cluster-demo/system.conf.cluster-demo.in +++ /dev/null @@ -1,8 +0,0 @@ -[Manager] -DefaultEnvironment = DLM_RUNTIME_PATH=/var/display/drm-lease-manager -DefaultEnvironment = DRM_LEASE_DEVICE=card0-HDMI-A-2 -DefaultEnvironment = QT_QPA_PLATFORM=wayland -DefaultEnvironment = QT_QPA_PLATFORM_PLUGIN_PATH=/usr/lib/plugins/ -DefaultEnvironment = QML_IMPORT_PATH=/usr/lib/qml/ -DefaultEnvironment = QML2_IMPORT_PATH=/usr/lib/qml/ -DefaultEnvironment = QT_WAYLAND_SHELL_INTEGRATION=xdg-shell diff --git a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-cluster-demo_%.bbappend b/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-cluster-demo_%.bbappend index eca0cbc2..0a487ad8 100644 --- a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-cluster-demo_%.bbappend +++ b/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-cluster-demo_%.bbappend @@ -1,2 +1,7 @@ # Container Manager config for cluster demo on R-Car Gen3 FILESEXTRAPATHS:prepend := "${THISDIR}/cm-config-cluster-demo:" + +require conf/include/drm-lease-multi-display.inc + +# If you want to change display assign in your board, please change this line in your recipe. +DRM_LEASE_DEVICE ?= "${@bb.utils.contains("HAS_MULTI_DISPLAY", "1", "card0-HDMI-A-2", "card0-HDMI-A-1" ,d)}" diff --git a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-cluster-demo_1.0.bbappend b/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-cluster-demo_1.0.bbappend index 92888ba8..07fc0da3 100644 --- a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-cluster-demo_1.0.bbappend +++ b/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-cluster-demo_1.0.bbappend @@ -1,4 +1,4 @@ -require multi-display.inc +require conf/include/drm-lease-multi-display.inc FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" diff --git a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-ivi-demo_1.0.bbappend b/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-ivi-demo_1.0.bbappend index f58fe2cb..f3a0e60d 100644 --- a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-ivi-demo_1.0.bbappend +++ b/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/lxc-config-ivi-demo_1.0.bbappend @@ -1,4 +1,4 @@ -require multi-display.inc +require conf/include/drm-lease-multi-display.inc FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" diff --git a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/multi-display.inc b/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/multi-display.inc deleted file mode 100644 index 96a3e29e..00000000 --- a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/multi-display.inc +++ /dev/null @@ -1,3 +0,0 @@ -HAS_MULTI_DISPLAY ?= "" -HAS_MULTI_DISPLAY += "${@bb.utils.contains("AGL_FEATURES", "kingfisher", "1", "" ,d)}" -HAS_MULTI_DISPLAY += "${@bb.utils.contains("AGL_FEATURES", "agl-refhw-h3", "1", "" ,d)}" -- cgit 1.2.3-korg