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 <gabriel.valcazar@digi.com>
This commit is contained in:
parent
bdbe657578
commit
b9f46a9100
|
|
@ -25,7 +25,7 @@ MKP_GREEN="\033[1;32m"
|
||||||
MKP_NONE="\033[0m"
|
MKP_NONE="\033[0m"
|
||||||
|
|
||||||
# Path to platform config files
|
# 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)
|
# Blacklist platforms (not officially supported in a DEY release)
|
||||||
MKP_BLACKLIST_PLATFORMS=""
|
MKP_BLACKLIST_PLATFORMS=""
|
||||||
|
|
@ -180,12 +180,12 @@ while getopts "lp:m:" c; do
|
||||||
case "${c}" in
|
case "${c}" in
|
||||||
l) MKP_LIST_PLATFORMS="y";;
|
l) MKP_LIST_PLATFORMS="y";;
|
||||||
p) MKP_PLATFORM="${OPTARG}";;
|
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
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
## Get available platforms
|
## 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
|
## Sanity checks
|
||||||
if [ "${BASH_SOURCE}" = "${0}" ]; then
|
if [ "${BASH_SOURCE}" = "${0}" ]; then
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue