From b9f46a9100daed161ee5f30d020924aea0c4aac4 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Fri, 10 May 2024 11:17:19 +0200 Subject: [PATCH] sdk: move templates to conf/templates in preparation for Yocto 5.0 (Scarthgap) Starting in poky commit 8791c77a4098d62080ecad09d94718eccd7f1a47, there is now a check to make sure TEMPLATECONF follows specific rules. If we don't abide by them, an error will occur when creating a project with our mkproject.sh script. Move the templates to the place they're supposed to be in and reflect the change in mkproject.sh. https://onedigi.atlassian.net/browse/DEL-9011 Signed-off-by: Gabriel Valcazar --- .../conf/templates}/ccimx6qpsbc/bblayers.conf.sample | 0 .../conf/templates}/ccimx6qpsbc/conf-notes.txt | 0 .../conf/templates}/ccimx6qpsbc/local.conf.sample | 0 .../conf/templates}/ccimx6sbc/bblayers.conf.sample | 0 .../conf/templates}/ccimx6sbc/conf-notes.txt | 0 .../conf/templates}/ccimx6sbc/local.conf.sample | 0 .../conf/templates}/ccimx6ulsbc/bblayers.conf.sample | 0 .../conf/templates}/ccimx6ulsbc/conf-notes.txt | 0 .../conf/templates}/ccimx6ulsbc/local.conf.sample | 0 .../conf/templates}/ccimx6ulstarter/bblayers.conf.sample | 0 .../conf/templates}/ccimx6ulstarter/conf-notes.txt | 0 .../conf/templates}/ccimx6ulstarter/local.conf.sample | 0 .../conf/templates}/ccimx8mm-dvk/bblayers.conf.sample | 0 .../conf/templates}/ccimx8mm-dvk/conf-notes.txt | 0 .../conf/templates}/ccimx8mm-dvk/local.conf.sample | 0 .../conf/templates}/ccimx8mn-dvk/bblayers.conf.sample | 0 .../conf/templates}/ccimx8mn-dvk/conf-notes.txt | 0 .../conf/templates}/ccimx8mn-dvk/local.conf.sample | 0 .../templates}/ccimx8x-sbc-express/bblayers.conf.sample | 0 .../conf/templates}/ccimx8x-sbc-express/conf-notes.txt | 0 .../conf/templates}/ccimx8x-sbc-express/local.conf.sample | 0 .../conf/templates}/ccimx8x-sbc-pro/bblayers.conf.sample | 0 .../conf/templates}/ccimx8x-sbc-pro/conf-notes.txt | 0 .../conf/templates}/ccimx8x-sbc-pro/local.conf.sample | 0 .../conf/templates}/ccimx91-dvk/bblayers.conf.sample | 0 .../conf/templates}/ccimx91-dvk/conf-notes.txt | 0 .../conf/templates}/ccimx91-dvk/local.conf.sample | 0 .../conf/templates}/ccimx93-dvk/bblayers.conf.sample | 0 .../conf/templates}/ccimx93-dvk/conf-notes.txt | 0 .../conf/templates}/ccimx93-dvk/local.conf.sample | 0 .../conf/templates}/ccmp13-dvk/bblayers.conf.sample | 0 .../conf/templates}/ccmp13-dvk/conf-notes.txt | 0 .../conf/templates}/ccmp13-dvk/local.conf.sample | 0 .../conf/templates}/ccmp15-dvk/bblayers.conf.sample | 0 .../conf/templates}/ccmp15-dvk/conf-notes.txt | 0 .../conf/templates}/ccmp15-dvk/local.conf.sample | 0 .../conf/templates}/ccmp25-dvk/bblayers.conf.sample | 0 .../conf/templates}/ccmp25-dvk/conf-notes.txt | 0 .../conf/templates}/ccmp25-dvk/local.conf.sample | 0 sdk/mkproject.sh | 6 +++--- 40 files changed, 3 insertions(+), 3 deletions(-) rename {sdk/config => meta-digi-arm/conf/templates}/ccimx6qpsbc/bblayers.conf.sample (100%) rename {sdk/config => meta-digi-arm/conf/templates}/ccimx6qpsbc/conf-notes.txt (100%) rename {sdk/config => meta-digi-arm/conf/templates}/ccimx6qpsbc/local.conf.sample (100%) rename {sdk/config => meta-digi-arm/conf/templates}/ccimx6sbc/bblayers.conf.sample (100%) rename {sdk/config => meta-digi-arm/conf/templates}/ccimx6sbc/conf-notes.txt (100%) rename {sdk/config => meta-digi-arm/conf/templates}/ccimx6sbc/local.conf.sample (100%) rename {sdk/config => meta-digi-arm/conf/templates}/ccimx6ulsbc/bblayers.conf.sample (100%) rename {sdk/config => meta-digi-arm/conf/templates}/ccimx6ulsbc/conf-notes.txt (100%) rename {sdk/config => meta-digi-arm/conf/templates}/ccimx6ulsbc/local.conf.sample (100%) rename {sdk/config => meta-digi-arm/conf/templates}/ccimx6ulstarter/bblayers.conf.sample (100%) rename {sdk/config => meta-digi-arm/conf/templates}/ccimx6ulstarter/conf-notes.txt (100%) rename {sdk/config => meta-digi-arm/conf/templates}/ccimx6ulstarter/local.conf.sample (100%) rename {sdk/config => meta-digi-arm/conf/templates}/ccimx8mm-dvk/bblayers.conf.sample (100%) rename {sdk/config => meta-digi-arm/conf/templates}/ccimx8mm-dvk/conf-notes.txt (100%) rename {sdk/config => meta-digi-arm/conf/templates}/ccimx8mm-dvk/local.conf.sample (100%) rename {sdk/config => meta-digi-arm/conf/templates}/ccimx8mn-dvk/bblayers.conf.sample (100%) rename {sdk/config => meta-digi-arm/conf/templates}/ccimx8mn-dvk/conf-notes.txt (100%) rename {sdk/config => meta-digi-arm/conf/templates}/ccimx8mn-dvk/local.conf.sample (100%) rename {sdk/config => meta-digi-arm/conf/templates}/ccimx8x-sbc-express/bblayers.conf.sample (100%) rename {sdk/config => meta-digi-arm/conf/templates}/ccimx8x-sbc-express/conf-notes.txt (100%) rename {sdk/config => meta-digi-arm/conf/templates}/ccimx8x-sbc-express/local.conf.sample (100%) rename {sdk/config => meta-digi-arm/conf/templates}/ccimx8x-sbc-pro/bblayers.conf.sample (100%) rename {sdk/config => meta-digi-arm/conf/templates}/ccimx8x-sbc-pro/conf-notes.txt (100%) rename {sdk/config => meta-digi-arm/conf/templates}/ccimx8x-sbc-pro/local.conf.sample (100%) rename {sdk/config => meta-digi-arm/conf/templates}/ccimx91-dvk/bblayers.conf.sample (100%) rename {sdk/config => meta-digi-arm/conf/templates}/ccimx91-dvk/conf-notes.txt (100%) rename {sdk/config => meta-digi-arm/conf/templates}/ccimx91-dvk/local.conf.sample (100%) rename {sdk/config => meta-digi-arm/conf/templates}/ccimx93-dvk/bblayers.conf.sample (100%) rename {sdk/config => meta-digi-arm/conf/templates}/ccimx93-dvk/conf-notes.txt (100%) rename {sdk/config => meta-digi-arm/conf/templates}/ccimx93-dvk/local.conf.sample (100%) rename {sdk/config => meta-digi-arm/conf/templates}/ccmp13-dvk/bblayers.conf.sample (100%) rename {sdk/config => meta-digi-arm/conf/templates}/ccmp13-dvk/conf-notes.txt (100%) rename {sdk/config => meta-digi-arm/conf/templates}/ccmp13-dvk/local.conf.sample (100%) rename {sdk/config => meta-digi-arm/conf/templates}/ccmp15-dvk/bblayers.conf.sample (100%) rename {sdk/config => meta-digi-arm/conf/templates}/ccmp15-dvk/conf-notes.txt (100%) rename {sdk/config => meta-digi-arm/conf/templates}/ccmp15-dvk/local.conf.sample (100%) rename {sdk/config => meta-digi-arm/conf/templates}/ccmp25-dvk/bblayers.conf.sample (100%) rename {sdk/config => meta-digi-arm/conf/templates}/ccmp25-dvk/conf-notes.txt (100%) rename {sdk/config => meta-digi-arm/conf/templates}/ccmp25-dvk/local.conf.sample (100%) diff --git a/sdk/config/ccimx6qpsbc/bblayers.conf.sample b/meta-digi-arm/conf/templates/ccimx6qpsbc/bblayers.conf.sample similarity index 100% rename from sdk/config/ccimx6qpsbc/bblayers.conf.sample rename to meta-digi-arm/conf/templates/ccimx6qpsbc/bblayers.conf.sample diff --git a/sdk/config/ccimx6qpsbc/conf-notes.txt b/meta-digi-arm/conf/templates/ccimx6qpsbc/conf-notes.txt similarity index 100% rename from sdk/config/ccimx6qpsbc/conf-notes.txt rename to meta-digi-arm/conf/templates/ccimx6qpsbc/conf-notes.txt diff --git a/sdk/config/ccimx6qpsbc/local.conf.sample b/meta-digi-arm/conf/templates/ccimx6qpsbc/local.conf.sample similarity index 100% rename from sdk/config/ccimx6qpsbc/local.conf.sample rename to meta-digi-arm/conf/templates/ccimx6qpsbc/local.conf.sample diff --git a/sdk/config/ccimx6sbc/bblayers.conf.sample b/meta-digi-arm/conf/templates/ccimx6sbc/bblayers.conf.sample similarity index 100% rename from sdk/config/ccimx6sbc/bblayers.conf.sample rename to meta-digi-arm/conf/templates/ccimx6sbc/bblayers.conf.sample diff --git a/sdk/config/ccimx6sbc/conf-notes.txt b/meta-digi-arm/conf/templates/ccimx6sbc/conf-notes.txt similarity index 100% rename from sdk/config/ccimx6sbc/conf-notes.txt rename to meta-digi-arm/conf/templates/ccimx6sbc/conf-notes.txt diff --git a/sdk/config/ccimx6sbc/local.conf.sample b/meta-digi-arm/conf/templates/ccimx6sbc/local.conf.sample similarity index 100% rename from sdk/config/ccimx6sbc/local.conf.sample rename to meta-digi-arm/conf/templates/ccimx6sbc/local.conf.sample diff --git a/sdk/config/ccimx6ulsbc/bblayers.conf.sample b/meta-digi-arm/conf/templates/ccimx6ulsbc/bblayers.conf.sample similarity index 100% rename from sdk/config/ccimx6ulsbc/bblayers.conf.sample rename to meta-digi-arm/conf/templates/ccimx6ulsbc/bblayers.conf.sample diff --git a/sdk/config/ccimx6ulsbc/conf-notes.txt b/meta-digi-arm/conf/templates/ccimx6ulsbc/conf-notes.txt similarity index 100% rename from sdk/config/ccimx6ulsbc/conf-notes.txt rename to meta-digi-arm/conf/templates/ccimx6ulsbc/conf-notes.txt diff --git a/sdk/config/ccimx6ulsbc/local.conf.sample b/meta-digi-arm/conf/templates/ccimx6ulsbc/local.conf.sample similarity index 100% rename from sdk/config/ccimx6ulsbc/local.conf.sample rename to meta-digi-arm/conf/templates/ccimx6ulsbc/local.conf.sample diff --git a/sdk/config/ccimx6ulstarter/bblayers.conf.sample b/meta-digi-arm/conf/templates/ccimx6ulstarter/bblayers.conf.sample similarity index 100% rename from sdk/config/ccimx6ulstarter/bblayers.conf.sample rename to meta-digi-arm/conf/templates/ccimx6ulstarter/bblayers.conf.sample diff --git a/sdk/config/ccimx6ulstarter/conf-notes.txt b/meta-digi-arm/conf/templates/ccimx6ulstarter/conf-notes.txt similarity index 100% rename from sdk/config/ccimx6ulstarter/conf-notes.txt rename to meta-digi-arm/conf/templates/ccimx6ulstarter/conf-notes.txt diff --git a/sdk/config/ccimx6ulstarter/local.conf.sample b/meta-digi-arm/conf/templates/ccimx6ulstarter/local.conf.sample similarity index 100% rename from sdk/config/ccimx6ulstarter/local.conf.sample rename to meta-digi-arm/conf/templates/ccimx6ulstarter/local.conf.sample diff --git a/sdk/config/ccimx8mm-dvk/bblayers.conf.sample b/meta-digi-arm/conf/templates/ccimx8mm-dvk/bblayers.conf.sample similarity index 100% rename from sdk/config/ccimx8mm-dvk/bblayers.conf.sample rename to meta-digi-arm/conf/templates/ccimx8mm-dvk/bblayers.conf.sample diff --git a/sdk/config/ccimx8mm-dvk/conf-notes.txt b/meta-digi-arm/conf/templates/ccimx8mm-dvk/conf-notes.txt similarity index 100% rename from sdk/config/ccimx8mm-dvk/conf-notes.txt rename to meta-digi-arm/conf/templates/ccimx8mm-dvk/conf-notes.txt diff --git a/sdk/config/ccimx8mm-dvk/local.conf.sample b/meta-digi-arm/conf/templates/ccimx8mm-dvk/local.conf.sample similarity index 100% rename from sdk/config/ccimx8mm-dvk/local.conf.sample rename to meta-digi-arm/conf/templates/ccimx8mm-dvk/local.conf.sample diff --git a/sdk/config/ccimx8mn-dvk/bblayers.conf.sample b/meta-digi-arm/conf/templates/ccimx8mn-dvk/bblayers.conf.sample similarity index 100% rename from sdk/config/ccimx8mn-dvk/bblayers.conf.sample rename to meta-digi-arm/conf/templates/ccimx8mn-dvk/bblayers.conf.sample diff --git a/sdk/config/ccimx8mn-dvk/conf-notes.txt b/meta-digi-arm/conf/templates/ccimx8mn-dvk/conf-notes.txt similarity index 100% rename from sdk/config/ccimx8mn-dvk/conf-notes.txt rename to meta-digi-arm/conf/templates/ccimx8mn-dvk/conf-notes.txt diff --git a/sdk/config/ccimx8mn-dvk/local.conf.sample b/meta-digi-arm/conf/templates/ccimx8mn-dvk/local.conf.sample similarity index 100% rename from sdk/config/ccimx8mn-dvk/local.conf.sample rename to meta-digi-arm/conf/templates/ccimx8mn-dvk/local.conf.sample diff --git a/sdk/config/ccimx8x-sbc-express/bblayers.conf.sample b/meta-digi-arm/conf/templates/ccimx8x-sbc-express/bblayers.conf.sample similarity index 100% rename from sdk/config/ccimx8x-sbc-express/bblayers.conf.sample rename to meta-digi-arm/conf/templates/ccimx8x-sbc-express/bblayers.conf.sample diff --git a/sdk/config/ccimx8x-sbc-express/conf-notes.txt b/meta-digi-arm/conf/templates/ccimx8x-sbc-express/conf-notes.txt similarity index 100% rename from sdk/config/ccimx8x-sbc-express/conf-notes.txt rename to meta-digi-arm/conf/templates/ccimx8x-sbc-express/conf-notes.txt diff --git a/sdk/config/ccimx8x-sbc-express/local.conf.sample b/meta-digi-arm/conf/templates/ccimx8x-sbc-express/local.conf.sample similarity index 100% rename from sdk/config/ccimx8x-sbc-express/local.conf.sample rename to meta-digi-arm/conf/templates/ccimx8x-sbc-express/local.conf.sample diff --git a/sdk/config/ccimx8x-sbc-pro/bblayers.conf.sample b/meta-digi-arm/conf/templates/ccimx8x-sbc-pro/bblayers.conf.sample similarity index 100% rename from sdk/config/ccimx8x-sbc-pro/bblayers.conf.sample rename to meta-digi-arm/conf/templates/ccimx8x-sbc-pro/bblayers.conf.sample diff --git a/sdk/config/ccimx8x-sbc-pro/conf-notes.txt b/meta-digi-arm/conf/templates/ccimx8x-sbc-pro/conf-notes.txt similarity index 100% rename from sdk/config/ccimx8x-sbc-pro/conf-notes.txt rename to meta-digi-arm/conf/templates/ccimx8x-sbc-pro/conf-notes.txt diff --git a/sdk/config/ccimx8x-sbc-pro/local.conf.sample b/meta-digi-arm/conf/templates/ccimx8x-sbc-pro/local.conf.sample similarity index 100% rename from sdk/config/ccimx8x-sbc-pro/local.conf.sample rename to meta-digi-arm/conf/templates/ccimx8x-sbc-pro/local.conf.sample diff --git a/sdk/config/ccimx91-dvk/bblayers.conf.sample b/meta-digi-arm/conf/templates/ccimx91-dvk/bblayers.conf.sample similarity index 100% rename from sdk/config/ccimx91-dvk/bblayers.conf.sample rename to meta-digi-arm/conf/templates/ccimx91-dvk/bblayers.conf.sample diff --git a/sdk/config/ccimx91-dvk/conf-notes.txt b/meta-digi-arm/conf/templates/ccimx91-dvk/conf-notes.txt similarity index 100% rename from sdk/config/ccimx91-dvk/conf-notes.txt rename to meta-digi-arm/conf/templates/ccimx91-dvk/conf-notes.txt diff --git a/sdk/config/ccimx91-dvk/local.conf.sample b/meta-digi-arm/conf/templates/ccimx91-dvk/local.conf.sample similarity index 100% rename from sdk/config/ccimx91-dvk/local.conf.sample rename to meta-digi-arm/conf/templates/ccimx91-dvk/local.conf.sample diff --git a/sdk/config/ccimx93-dvk/bblayers.conf.sample b/meta-digi-arm/conf/templates/ccimx93-dvk/bblayers.conf.sample similarity index 100% rename from sdk/config/ccimx93-dvk/bblayers.conf.sample rename to meta-digi-arm/conf/templates/ccimx93-dvk/bblayers.conf.sample diff --git a/sdk/config/ccimx93-dvk/conf-notes.txt b/meta-digi-arm/conf/templates/ccimx93-dvk/conf-notes.txt similarity index 100% rename from sdk/config/ccimx93-dvk/conf-notes.txt rename to meta-digi-arm/conf/templates/ccimx93-dvk/conf-notes.txt diff --git a/sdk/config/ccimx93-dvk/local.conf.sample b/meta-digi-arm/conf/templates/ccimx93-dvk/local.conf.sample similarity index 100% rename from sdk/config/ccimx93-dvk/local.conf.sample rename to meta-digi-arm/conf/templates/ccimx93-dvk/local.conf.sample diff --git a/sdk/config/ccmp13-dvk/bblayers.conf.sample b/meta-digi-arm/conf/templates/ccmp13-dvk/bblayers.conf.sample similarity index 100% rename from sdk/config/ccmp13-dvk/bblayers.conf.sample rename to meta-digi-arm/conf/templates/ccmp13-dvk/bblayers.conf.sample diff --git a/sdk/config/ccmp13-dvk/conf-notes.txt b/meta-digi-arm/conf/templates/ccmp13-dvk/conf-notes.txt similarity index 100% rename from sdk/config/ccmp13-dvk/conf-notes.txt rename to meta-digi-arm/conf/templates/ccmp13-dvk/conf-notes.txt diff --git a/sdk/config/ccmp13-dvk/local.conf.sample b/meta-digi-arm/conf/templates/ccmp13-dvk/local.conf.sample similarity index 100% rename from sdk/config/ccmp13-dvk/local.conf.sample rename to meta-digi-arm/conf/templates/ccmp13-dvk/local.conf.sample diff --git a/sdk/config/ccmp15-dvk/bblayers.conf.sample b/meta-digi-arm/conf/templates/ccmp15-dvk/bblayers.conf.sample similarity index 100% rename from sdk/config/ccmp15-dvk/bblayers.conf.sample rename to meta-digi-arm/conf/templates/ccmp15-dvk/bblayers.conf.sample diff --git a/sdk/config/ccmp15-dvk/conf-notes.txt b/meta-digi-arm/conf/templates/ccmp15-dvk/conf-notes.txt similarity index 100% rename from sdk/config/ccmp15-dvk/conf-notes.txt rename to meta-digi-arm/conf/templates/ccmp15-dvk/conf-notes.txt diff --git a/sdk/config/ccmp15-dvk/local.conf.sample b/meta-digi-arm/conf/templates/ccmp15-dvk/local.conf.sample similarity index 100% rename from sdk/config/ccmp15-dvk/local.conf.sample rename to meta-digi-arm/conf/templates/ccmp15-dvk/local.conf.sample diff --git a/sdk/config/ccmp25-dvk/bblayers.conf.sample b/meta-digi-arm/conf/templates/ccmp25-dvk/bblayers.conf.sample similarity index 100% rename from sdk/config/ccmp25-dvk/bblayers.conf.sample rename to meta-digi-arm/conf/templates/ccmp25-dvk/bblayers.conf.sample diff --git a/sdk/config/ccmp25-dvk/conf-notes.txt b/meta-digi-arm/conf/templates/ccmp25-dvk/conf-notes.txt similarity index 100% rename from sdk/config/ccmp25-dvk/conf-notes.txt rename to meta-digi-arm/conf/templates/ccmp25-dvk/conf-notes.txt diff --git a/sdk/config/ccmp25-dvk/local.conf.sample b/meta-digi-arm/conf/templates/ccmp25-dvk/local.conf.sample similarity index 100% rename from sdk/config/ccmp25-dvk/local.conf.sample rename to meta-digi-arm/conf/templates/ccmp25-dvk/local.conf.sample diff --git a/sdk/mkproject.sh b/sdk/mkproject.sh index 5bf135675..8d56df5a9 100755 --- a/sdk/mkproject.sh +++ b/sdk/mkproject.sh @@ -25,7 +25,7 @@ MKP_GREEN="\033[1;32m" MKP_NONE="\033[0m" # Path to platform config files -MKP_CONFIGPATH="${MKP_SCRIPTPATH}/sources/meta-digi/sdk/config" +MKP_CONFIGPATH="${MKP_SCRIPTPATH}/sources/meta-digi/meta-digi-arm/conf/templates" # Blacklist platforms (not officially supported in a DEY release) MKP_BLACKLIST_PLATFORMS="" @@ -180,12 +180,12 @@ while getopts "lp:m:" c; do case "${c}" in l) MKP_LIST_PLATFORMS="y";; p) MKP_PLATFORM="${OPTARG}";; - m) MKP_CONFIGPATH="${MKP_SCRIPTPATH}/sources/${OPTARG}/sdk/config";; + m) MKP_CONFIGPATH="${MKP_SCRIPTPATH}/sources/${OPTARG}/meta-digi-arm/conf/templates";; esac done ## Get available platforms -MKP_AVAILABLE_PLATFORMS="$(echo $(ls -1 ${MKP_CONFIGPATH}/*/local.conf.sample | sed -e 's,^.*config/\([^/]\+\)/local\.conf\.sample,\1,g'))" +MKP_AVAILABLE_PLATFORMS="$(echo $(ls -1 ${MKP_CONFIGPATH}/*/local.conf.sample | sed -e 's,^.*templates/\([^/]\+\)/local\.conf\.sample,\1,g'))" ## Sanity checks if [ "${BASH_SOURCE}" = "${0}" ]; then