X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=scripts%2F.aglsetup_genconfig.bash;h=c7ed92e478a7dbae8982e186cc623807464fe6c3;hb=refs%2Ftags%2F15.0.3;hp=b9f4e5e947556a7e6dd323b7fe758cbce90db962;hpb=d59e0aea8b31fd2d13b1bb91ba4586355743d1b6;p=AGL%2Fmeta-agl.git

diff --git a/scripts/.aglsetup_genconfig.bash b/scripts/.aglsetup_genconfig.bash
index b9f4e5e94..c7ed92e47 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() {
@@ -559,12 +559,12 @@ infon "Generating setup file: $BUILDDIR/agl-init-build-env ... "
 cat <<EOF >$BUILDDIR/agl-init-build-env
 . $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"