From c6f2b57be8893ee58f20cc29d8ec3a5a6edf7c07 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 31 Aug 2022 13:13:55 +0200 Subject: scripts/oe-setup-builddir: add a check that TEMPLATECONF is valid specifically that ../../layer.conf exists, and that second-from-last component in the path is 'templates'. This requires tweaking template.conf creation in eSDK bbclass, as we need to ensure that the path in it is valid, and exists (which may not be the case if the SDK is poky-based). Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- scripts/oe-setup-builddir | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'scripts') diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir index 975619789a..5b7d92089c 100755 --- a/scripts/oe-setup-builddir +++ b/scripts/oe-setup-builddir @@ -61,6 +61,11 @@ if [ -n "$TEMPLATECONF" ]; then echo >&2 "Error: TEMPLATECONF value points to nonexistent directory '$TEMPLATECONF'" exit 1 fi + templatesdir=$(python3 -c "import sys; print(sys.argv[1].strip('/').split('/')[-2])" $TEMPLATECONF) + if [ ! -f "$TEMPLATECONF/../../layer.conf" -o $templatesdir != "templates" ]; then + echo >&2 "Error: TEMPLATECONF value (which is $TEMPLATECONF) must point to meta-some-layer/conf/templates/template-name" + exit 1 + fi fi OECORELAYERCONF="$TEMPLATECONF/bblayers.conf.sample" OECORELOCALCONF="$TEMPLATECONF/local.conf.sample" -- cgit 1.2.3-korg