diff options
-rw-r--r-- | meta/classes-recipe/populate_sdk_ext.bbclass | 3 | ||||
-rwxr-xr-x | scripts/oe-setup-builddir | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/meta/classes-recipe/populate_sdk_ext.bbclass b/meta/classes-recipe/populate_sdk_ext.bbclass index 56e24c4eed..925cb313fc 100644 --- a/meta/classes-recipe/populate_sdk_ext.bbclass +++ b/meta/classes-recipe/populate_sdk_ext.bbclass | |||
@@ -438,7 +438,8 @@ python copy_buildsystem () { | |||
438 | else: | 438 | else: |
439 | # Write a templateconf.cfg | 439 | # Write a templateconf.cfg |
440 | with open(baseoutpath + '/conf/templateconf.cfg', 'w') as f: | 440 | with open(baseoutpath + '/conf/templateconf.cfg', 'w') as f: |
441 | f.write('meta/conf\n') | 441 | f.write('meta/conf/templates/default\n') |
442 | os.makedirs(os.path.join(baseoutpath, core_meta_subdir, 'conf/templates/default'), exist_ok=True) | ||
442 | 443 | ||
443 | # Ensure any variables set from the external environment (by way of | 444 | # Ensure any variables set from the external environment (by way of |
444 | # BB_ENV_PASSTHROUGH_ADDITIONS) are set in the SDK's configuration | 445 | # BB_ENV_PASSTHROUGH_ADDITIONS) are set in the SDK's configuration |
diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir index 5d644168cb..bf832ee0ca 100755 --- a/scripts/oe-setup-builddir +++ b/scripts/oe-setup-builddir | |||
@@ -61,6 +61,11 @@ if [ -n "$TEMPLATECONF" ]; then | |||
61 | echo >&2 "Error: TEMPLATECONF value points to nonexistent directory '$TEMPLATECONF'" | 61 | echo >&2 "Error: TEMPLATECONF value points to nonexistent directory '$TEMPLATECONF'" |
62 | exit 1 | 62 | exit 1 |
63 | fi | 63 | fi |
64 | templatesdir=$(python3 -c "import sys; print(sys.argv[1].strip('/').split('/')[-2])" $TEMPLATECONF) | ||
65 | if [ ! -f "$TEMPLATECONF/../../layer.conf" -o $templatesdir != "templates" ]; then | ||
66 | echo >&2 "Error: TEMPLATECONF value (which is $TEMPLATECONF) must point to meta-some-layer/conf/templates/template-name" | ||
67 | exit 1 | ||
68 | fi | ||
64 | fi | 69 | fi |
65 | OECORELAYERCONF="$TEMPLATECONF/bblayers.conf.sample" | 70 | OECORELAYERCONF="$TEMPLATECONF/bblayers.conf.sample" |
66 | OECORELOCALCONF="$TEMPLATECONF/local.conf.sample" | 71 | OECORELOCALCONF="$TEMPLATECONF/local.conf.sample" |