From f5786c01e8f0b97bc24eee90c951cb92ba664038 Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Thu, 23 Oct 2025 12:20:27 +0200 Subject: [PATCH] mkproject: ignore meta-digi-arm dir when other layer is selected Default value of 'MKP_CONFIGPATH' points to a config path in the meta-digi/meta-digi-arm layer. When mkproject.sh is called with the '-m' argument, another layer is provided to build the project from. In this layer the conf/templates new structure must be respected, but it is likely it does not contain a meta-digi-arm directory on top. Keep the 'meta-digi-arm' directory in the config path by default, but remove it when a different layer is provided through an argument. Signed-off-by: Gonzalo Ruiz (cherry picked from commit 7888fe3b22de4db5e02e6a2dab723db797e924b8) --- sdk/mkproject.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/mkproject.sh b/sdk/mkproject.sh index 354f3996c..31a5460a9 100755 --- a/sdk/mkproject.sh +++ b/sdk/mkproject.sh @@ -180,7 +180,7 @@ 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}/meta-digi-arm/conf/templates";; + m) MKP_CONFIGPATH="${MKP_SCRIPTPATH}/sources/${OPTARG}/conf/templates";; esac done