From f11599458c4978d4d47917f976eb4b1fd8910271 Mon Sep 17 00:00:00 2001 From: Naoto Yamaguchi Date: Fri, 12 May 2023 00:56:56 +0900 Subject: [PATCH] Move configuration files to subdirectory for rcar-gen3 In https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-devel/+/28799, I got a review comment for place of configuration files. This patch fix place of configuration files for rcar gen3. Bug-AGL : SPEC-4790 Change-Id: I68444e05848817c52908009d33b7d62d7921a377 Signed-off-by: Naoto Yamaguchi --- .../cm-config-agl-flutter-ivi-demo_%.bbappend | 2 -- .../cm-config-agl-html5-ivi-demo_%.bbappend | 2 -- .../cm-config-agl-momi-ivi-demo_%.bbappend | 2 -- .../container-manager-config/cm-config-agl-qt-ivi-demo_%.bbappend | 2 -- .../container-manager-config/cm-config-cluster-demo_%.bbappend | 7 ------- .../drm-lease-manager/drm-lease-manager-init.bbappend | 2 -- .../rcar-gen3}/agl-flutter-ivi-demo.json | 0 .../rcar-gen3}/agl-html5-ivi-demo.json | 0 .../cm-config-agl-momi-ivi-demo/rcar-gen3}/agl-momi-ivi-demo.json | 0 .../cm-config-agl-qt-ivi-demo/rcar-gen3}/agl-qt-ivi-demo.json | 0 .../cm-config-cluster-demo/rcar-gen3}/cluster-demo.json | 0 .../drm-lease-manager-init/rcar-gen3}/drm-lease-manager.ini | 0 12 files changed, 17 deletions(-) delete mode 100644 meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo_%.bbappend delete mode 100644 meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo_%.bbappend delete mode 100644 meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo_%.bbappend delete mode 100644 meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo_%.bbappend delete mode 100644 meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-cluster-demo_%.bbappend delete mode 100644 meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-graphics/drm-lease-manager/drm-lease-manager-init.bbappend rename meta-agl-ic-container/{dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo => recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo/rcar-gen3}/agl-flutter-ivi-demo.json (100%) rename meta-agl-ic-container/{dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo => recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo/rcar-gen3}/agl-html5-ivi-demo.json (100%) rename meta-agl-ic-container/{dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo => recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo/rcar-gen3}/agl-momi-ivi-demo.json (100%) rename meta-agl-ic-container/{dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo => recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo/rcar-gen3}/agl-qt-ivi-demo.json (100%) rename meta-agl-ic-container/{dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-cluster-demo => recipes-container/container-manager-config/cm-config-cluster-demo/rcar-gen3}/cluster-demo.json (100%) rename meta-agl-ic-container/{dynamic-layers/meta-rcar-gen3/recipes-graphics/drm-lease-manager/drm-lease-manager-init => recipes-graphics/drm-lease-manager/drm-lease-manager-init/rcar-gen3}/drm-lease-manager.ini (100%) 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 deleted file mode 100644 index bd73278b..00000000 --- a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo_%.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -# 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 deleted file mode 100644 index e810a7f0..00000000 --- a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo_%.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -# 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_%.bbappend b/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo_%.bbappend deleted file mode 100644 index 8f229830..00000000 --- a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo_%.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -# Container Manager config for AGL Momi IVI demo on R-Car Gen3 -FILESEXTRAPATHS:prepend := "${THISDIR}/cm-config-agl-momi-ivi-demo:" 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 deleted file mode 100644 index 9c0ff8c2..00000000 --- a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo_%.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -# 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_%.bbappend b/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-cluster-demo_%.bbappend deleted file mode 100644 index 0a487ad8..00000000 --- a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-cluster-demo_%.bbappend +++ /dev/null @@ -1,7 +0,0 @@ -# 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-graphics/drm-lease-manager/drm-lease-manager-init.bbappend b/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-graphics/drm-lease-manager/drm-lease-manager-init.bbappend deleted file mode 100644 index 371f6539..00000000 --- a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-graphics/drm-lease-manager/drm-lease-manager-init.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI = "file://drm-lease-manager.ini" diff --git a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo/agl-flutter-ivi-demo.json b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo/rcar-gen3/agl-flutter-ivi-demo.json similarity index 100% rename from meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo/agl-flutter-ivi-demo.json rename to meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-flutter-ivi-demo/rcar-gen3/agl-flutter-ivi-demo.json diff --git a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo/agl-html5-ivi-demo.json b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo/rcar-gen3/agl-html5-ivi-demo.json similarity index 100% rename from meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo/agl-html5-ivi-demo.json rename to meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-html5-ivi-demo/rcar-gen3/agl-html5-ivi-demo.json diff --git a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo/agl-momi-ivi-demo.json b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo/rcar-gen3/agl-momi-ivi-demo.json similarity index 100% rename from meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo/agl-momi-ivi-demo.json rename to meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-momi-ivi-demo/rcar-gen3/agl-momi-ivi-demo.json diff --git a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo/agl-qt-ivi-demo.json b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo/rcar-gen3/agl-qt-ivi-demo.json similarity index 100% rename from meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo/agl-qt-ivi-demo.json rename to meta-agl-ic-container/recipes-container/container-manager-config/cm-config-agl-qt-ivi-demo/rcar-gen3/agl-qt-ivi-demo.json diff --git a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-cluster-demo/cluster-demo.json b/meta-agl-ic-container/recipes-container/container-manager-config/cm-config-cluster-demo/rcar-gen3/cluster-demo.json similarity index 100% rename from meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-container/container-manager-config/cm-config-cluster-demo/cluster-demo.json rename to meta-agl-ic-container/recipes-container/container-manager-config/cm-config-cluster-demo/rcar-gen3/cluster-demo.json diff --git a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-graphics/drm-lease-manager/drm-lease-manager-init/drm-lease-manager.ini b/meta-agl-ic-container/recipes-graphics/drm-lease-manager/drm-lease-manager-init/rcar-gen3/drm-lease-manager.ini similarity index 100% rename from meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-graphics/drm-lease-manager/drm-lease-manager-init/drm-lease-manager.ini rename to meta-agl-ic-container/recipes-graphics/drm-lease-manager/drm-lease-manager-init/rcar-gen3/drm-lease-manager.ini -- 2.16.6