X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=scripts%2F.aglsetup_genconfig.bash;fp=scripts%2F.aglsetup_genconfig.bash;h=e95605a65f230642133102b964a1c3dd5065f441;hb=f059765855313acf2fd1f011d833d8da09dcdb21;hp=1e6eb1ee8e91f0da925103c1cab7c4b3078bca3e;hpb=04bf517aac819a6ee4a9b3a14f32ee7dd9807bc2;p=AGL%2Fmeta-agl.git

diff --git a/scripts/.aglsetup_genconfig.bash b/scripts/.aglsetup_genconfig.bash
index 1e6eb1ee8..e95605a65 100755
--- a/scripts/.aglsetup_genconfig.bash
+++ b/scripts/.aglsetup_genconfig.bash
@@ -302,6 +302,8 @@ BUILDDIR=$DEFAULT_BUILDDIR
 SETUPSCRIPT=
 FORCE=
 RPMREVISION=
+SETUP_MANIFEST=aglsetup.manifest
+
 while true; do
 	case "$1" in
 		-m|--machine)      MACHINE=$2; shift 2;;
@@ -407,6 +409,12 @@ function genconfig() {
 		append_fragment $BUILDDIR/conf/local.conf $file
 		verbose "      + $file"
 	done
+	# special fragment to call distro-manifest-generator.sh from 
+	# meta-agl-profile-core/recipes-core/distro-build-manifest/distro-build-manifest.bb
+	append_fragment $BUILDDIR/conf/local.conf /dev/stdin "# generated by $(realpath $BASH_SOURCE)" <<-EOF
+		DISTRO_SETUP_MANIFEST = "$(realpath -Ls $BUILDDIR)/$SETUP_MANIFEST"
+		DISTRO_MANIFEST_GENERATOR = "$(dirname $(realpath $BASH_SOURCE))/distro-manifest-generator.sh"
+	EOF
 
 	FRAGMENTS_SETUP=$(sed 's/ /\n/g' <<<$FRAGMENTS_SETUP | sort)
 	debug "setup fragments: $FRAGMENTS_SETUP"
@@ -470,8 +478,6 @@ fi
 
 ####### step 2: generate aglsetup.manifest #######
 
-SETUP_MANIFEST=aglsetup.manifest
-
 infon "Generating setup manifest: $BUILDDIR/$SETUP_MANIFEST ... "
 for x in /etc/os-release /usr/lib/os-release; do
 	[[ -f $x ]] && . $x
@@ -518,12 +524,6 @@ fi
 if [ -n "\$SSTATE_DIR" ]; then
 	BB_ENV_EXTRAWHITE="\$BB_ENV_EXTRAWHITE SSTATE_DIR"
 fi
-
-# build manifest generator used in distro-build-manifest.bb
-BB_ENV_EXTRAWHITE="\$BB_ENV_EXTRAWHITE DISTRO_SETUP_MANIFEST DISTRO_MANIFEST_GENERATOR"
-export DISTRO_SETUP_MANIFEST=$(realpath -Ls $BUILDDIR)/$SETUP_MANIFEST
-export DISTRO_MANIFEST_GENERATOR=$(dirname $(realpath $BASH_SOURCE))/distro-manifest-generator.sh
-
 export BB_ENV_EXTRAWHITE
 unset TEMPLATECONF
 EOF