Handle upstream TEMPLATECONF change

oe-core now requires that TEMPLATECONF point at conf/templates/*
inside a layer, tweak things to move the base template files into
meta-agl-core to match its expectations.

Bug-AGL: SPEC-4578

Change-Id: Idb0af9b4bd6bc55b9fb2cb50a675e928e7c2b025
Signed-off-by: Scott Murray <scott.murray@konsulko.com>

5 files changed, 6 insertions, 4 deletions

diff --git a/templates/base/bblayers.conf.sample b/meta-agl-core/conf/templates/base/bblayers.conf.sample
index e3c5fcc65..5b5400faf 100644
--- a/templates/base/bblayers.conf.sample
+++ b/meta-agl-core/conf/templates/base/bblayers.conf.sample
@@ -36,7 +36,7 @@ AGL_CORE_DEPENDENCY_LAYERS = " \
   "
 
 # Indirection to avoid duplicate inclusions of the same folder into BBLAYERS
-# the evaluation is in the bblayers.conf.sample in meta-agl/templates/base
+# the evaluation is in the bblayers.conf.sample in meta-agl/meta-agl-core/conf/templates/base
 AGL_META_NETWORKING ?= ""
 AGL_META_PYTHON ?= ""
 AGL_META_FILESYSTEMS ?= ""
diff --git a/templates/base/conf-notes.txt b/meta-agl-core/conf/templates/base/conf-notes.txt
index 09ae72647..09ae72647 100644
--- a/templates/base/conf-notes.txt
+++ b/meta-agl-core/conf/templates/base/conf-notes.txt
diff --git a/templates/base/local.conf.sample b/meta-agl-core/conf/templates/base/local.conf.sample
index 7f2c0b11a..7f2c0b11a 100644
--- a/templates/base/local.conf.sample
+++ b/meta-agl-core/conf/templates/base/local.conf.sample
diff --git a/scripts/.aglsetup_genconfig.bash b/scripts/.aglsetup_genconfig.bash
index c7ed92e47..3d380e69d 100755
--- a/scripts/.aglsetup_genconfig.bash
+++ b/scripts/.aglsetup_genconfig.bash
@@ -407,7 +407,7 @@ function genconfig() {
 	info "   Features: $FEATURES"
 
 	# step 1: run usual OE setup to generate conf dir
-	export TEMPLATECONF=$(cd $SCRIPTDIR/../templates/base && pwd -P)
+	export TEMPLATECONF=$(cd $SCRIPTDIR/../meta-agl-core/conf/templates/base && pwd -P)
 	debug "running oe-init-build-env with TEMPLATECONF=$TEMPLATECONF"
 	info "   Running $METADIR/external/poky/oe-init-build-env"
 	info "   Templates dir: $TEMPLATECONF"
@@ -417,7 +417,8 @@ function genconfig() {
 	cd $CURDIR
 
 	# step 2: concatenate other remaining fragments coming from base
-	process_fragments $TEMPLATECONF
+	FRAGMENTS=$(cd $SCRIPTDIR/../templates/base && pwd -P)
+	process_fragments $FRAGMENTS
 
 	# step 3: fragments for machine
 	process_fragments $(find_machine_dir $MACHINE)
@@ -557,6 +558,7 @@ info "OK"
 infon "Generating setup file: $BUILDDIR/agl-init-build-env ... "
 
 cat <<EOF >$BUILDDIR/agl-init-build-env
+export TEMPLATECONF=${METADIR}/meta-agl/meta-agl-core/conf/templates/base
 . $METADIR/external/poky/oe-init-build-env $BUILDDIR
 if [ -n "\$DL_DIR" ]; then
 	BB_ENV_PASSTHROUGH_ADDITIONS="\$BB_ENV_PASSTHROUGH_ADDITIONS DL_DIR"
diff --git a/templates/feature/agl-netboot/50_bblayers.conf.inc b/templates/feature/agl-netboot/50_bblayers.conf.inc
index 7cbff1662..94e784a1a 100644
--- a/templates/feature/agl-netboot/50_bblayers.conf.inc
+++ b/templates/feature/agl-netboot/50_bblayers.conf.inc
@@ -2,6 +2,6 @@ BBLAYERS =+ " ${METADIR}/meta-agl/meta-netboot \
             "
 
 # Indirection to avoid duplicate inclusions of the same folder into BBLAYERS
-# the evaluation is in the bblayers.conf.sample in meta-agl/templates/base
+# the evaluation is in the bblayers.conf.sample in meta-agl/meta-agl-core/conf/templates/base
 AGL_META_PYTHON = "${METADIR}/external/meta-openembedded/meta-python"
 AGL_META_NETWORKING = "${METADIR}/external/meta-openembedded/meta-networking"