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

diff --git a/scripts/.aglsetup_genconfig.bash b/scripts/.aglsetup_genconfig.bash
index 323479c3c..3d380e69d 100755
--- a/scripts/.aglsetup_genconfig.bash
+++ b/scripts/.aglsetup_genconfig.bash
@@ -223,15 +223,15 @@ function append_fragment() {
 	echo >>$basefile
 	echo "# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #" >>$basefile
 	echo "# fragment { " >>$basefile
-	[[ -f $f ]] && echo "# $f" >>$basefile || true
+	[[ -n $f ]] && echo "# $f" >>$basefile || true
 	echo "#" >>$basefile
 	[[ -n "$label" ]] && echo "$label" >>$basefile
-	[[ -f $f ]] && cat $f >>$basefile || true
+	[[ -n $f ]] && cat $f >>$basefile || true
 	echo "" >>$basefile
 	echo "#" >>$basefile
 	echo "# }" >>$basefile
 	echo "# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #" >>$basefile
-	[[ -f $f ]] && echo $f >>$BUILDDIR/conf/fragments.log || true
+	[[ -n $f ]] && echo $f >>$BUILDDIR/conf/fragments.log || true
 }
 
 function execute_setup() {
@@ -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)
@@ -496,6 +497,7 @@ EOF
 [[ $FORCE -eq 1 ]] && rm -f \
 	$BUILDDIR/conf/local.conf \
 	$BUILDDIR/conf/bblayers.conf \
+	$BUILDDIR/conf/templateconf.cfg \
 	$BUILDDIR/conf/setup.* \
 	$BUILDDIR/conf/*.log
 
@@ -556,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"