diff options
23 files changed, 59 insertions, 106 deletions
diff --git a/meta-agl-ic-container/classes/cm-config.bbclass b/meta-agl-ic-container/classes/cm-config.bbclass new file mode 100644 index 00000000..60dec951 --- /dev/null +++ b/meta-agl-ic-container/classes/cm-config.bbclass @@ -0,0 +1,34 @@ +# Helper class for container manager config creation. +# Assumes that: +# - Recipe name is 'cm-config-' + <guest name> +# - Corresponding files {config,system.conf}.<guest name>.in are in +# the file search path +# - That references to the DRM lease device name are parameterized +# with @DRM_LEASE_DEVICE@ in the .in files + +python __anonymous() { + bpn = d.getVar('BPN') + if not bpn.startswith('cm-config-'): + bb.error('Recipe name does not start with \'cm-config-\'') + config = bpn[10:] + d.setVar('CM_CONFIG_NAME', config) +} + +S = "${WORKDIR}" + +inherit allarch + +DRM_LEASE_DEVICE ??= "card0-HDMI-A-1" + +do_configure[noexec] = "1" +do_compile[noexec] = "1" + +do_install:append () { + install -m 0755 -d ${D}/opt/container/guests/${CM_CONFIG_NAME} + for f in system.conf.${CM_CONFIG_NAME}.in; do + sed -e 's|@DRM_LEASE_DEVICE@|${DRM_LEASE_DEVICE}|g' \ + ${WORKDIR}/$f > ${D}/opt/container/guests/${CM_CONFIG_NAME}/${f%.${CM_CONFIG_NAME}.in} + done +} + +FILES:${PN}:append = "/opt/container/guests/${CM_CONFIG_NAME}" diff --git a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/multi-display.inc b/meta-agl-ic-container/conf/include/drm-lease-multi-display.inc index 96a3e29e..96a3e29e 100644 --- a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/lxc-config/multi-display.inc +++ b/meta-agl-ic-container/conf/include/drm-lease-multi-display.inc 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_%.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/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/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/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/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/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/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.in deleted file mode 100644 index ee7a4103..00000000 --- a/meta-agl-ic-container/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/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/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/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/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/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/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.in deleted file mode 100644 index ee7a4103..00000000 --- a/meta-agl-ic-container/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/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} += " \ |