X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=scripts%2F.aglsetup_genconfig.bash;h=e73facd11e6388e8c8d49b948f5bc084ea10db08;hb=refs%2Fchanges%2F99%2F6899%2F1;hp=57a31e261fc447d43410eaa03a1ed5791fac24d8;hpb=fb58b6599373ee0a134c09c53a76fca54a0a8880;p=AGL%2Fmeta-agl.git

diff --git a/scripts/.aglsetup_genconfig.bash b/scripts/.aglsetup_genconfig.bash
index 57a31e261..e73facd11 100755
--- a/scripts/.aglsetup_genconfig.bash
+++ b/scripts/.aglsetup_genconfig.bash
@@ -5,6 +5,7 @@
 # The MIT License (MIT)
 #
 # Copyright (c) 2016 Stéphane Desneux <sdx@iot.bzh>
+#           (c) 2016 Jan-Simon Möller <jsmoeller@linuxfoundation.org>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -287,6 +288,14 @@ find_machine_dir $MACHINE >/dev/null || error "Machine '$MACHINE' not found in [
 debug "validating features list"
 validate_features
 
+if $(echo "$FEATURES" | grep -q 'agl-all-features' 2>&1 ) ; then
+    featuredir=$(find_feature_dir agl-all-features)
+    tmpfeatures="$FEATURES $(cat $featuredir/included.inc)"
+    tmpfeatures_uniq="$(echo $tmpfeatures | sed -e 's/agl-all-features//g' -e 's/  / /g' | sort -u )"
+    export FEATURES=$tmpfeatures_uniq
+    echo "Features used: $FEATURES"
+fi
+
 # validate the features
 for f in $FEATURES; do
 	debug "validating feature $f"
@@ -373,17 +382,17 @@ EOF
 	append_fragment $BUILDDIR/conf/setup.sh "" "echo '--- end of setup script'"
 
 	infon "   Executing setup script ... "
-	execute_setup $BUILDDIR/conf/setup.sh 2>&1 | tee $BUILDDIR/conf/setup.log \
-		&& { 
-			info "OK"
-			[[ $VERBOSE == 1 ]] && dump_log $BUILDDIR/conf/setup.log
-			rm $BUILDDIR/conf/setup.sh
-		} \
-		|| { 
-			info "FAIL: please check $BUILDDIR/conf/setup.log"
-			dump_log $BUILDDIR/conf/setup.log
-			return 1
-		}
+	execute_setup $BUILDDIR/conf/setup.sh 2>&1 | tee $BUILDDIR/conf/setup.log
+	[[ ${PIPESTATUS[0]} == 0 ]] && {
+		info "OK"
+		[[ $VERBOSE == 1 ]] && dump_log $BUILDDIR/conf/setup.log
+		rm $BUILDDIR/conf/setup.sh
+	} \
+	|| {
+		info "FAIL: please check $BUILDDIR/conf/setup.log"
+		dump_log $BUILDDIR/conf/setup.log
+		return 1
+	}
 	# NOTE: the setup.sh script is removed if execution succeeded (only the log remains)
 }