X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=scripts%2F.aglsetup_genconfig.bash;h=3d380e69d77dc6938d7c424c7026971077886e4a;hb=HEAD;hp=cf06622ba510c0b1664ef97915ed4459a5a0edbf;hpb=fac66e3b82213a2147edca7212ca3c0121e2b250;p=AGL%2Fmeta-agl.git

diff --git a/scripts/.aglsetup_genconfig.bash b/scripts/.aglsetup_genconfig.bash
index cf06622ba..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,14 +558,15 @@ 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_EXTRAWHITE="\$BB_ENV_EXTRAWHITE DL_DIR"
+	BB_ENV_PASSTHROUGH_ADDITIONS="\$BB_ENV_PASSTHROUGH_ADDITIONS DL_DIR"
 fi
 if [ -n "\$SSTATE_DIR" ]; then
-	BB_ENV_EXTRAWHITE="\$BB_ENV_EXTRAWHITE SSTATE_DIR"
+	BB_ENV_PASSTHROUGH_ADDITIONS="\$BB_ENV_PASSTHROUGH_ADDITIONS SSTATE_DIR"
 fi
-export BB_ENV_EXTRAWHITE
+export BB_ENV_PASSTHROUGH_ADDITIONS
 unset TEMPLATECONF
 EOF
 info "OK"