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

diff --git a/scripts/.aglsetup_genconfig.bash b/scripts/.aglsetup_genconfig.bash
index 57a31e261..285ecee50 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
@@ -171,8 +172,13 @@ EOF
 		buf=$(list_features $x)
 		[[ -z "$buf" ]] && continue
 		echo "   [$x]"
-		for y in $buf; do
-			echo "       $y"
+		for feature in $buf; do
+			print_feature="$feature"
+			featuredir=$(find_feature_dir $feature)
+			if [ -e $featuredir/included.dep ];then
+				print_feature="$print_feature :($(find_feature_dependency $feature $feature))"
+			fi;
+			echo "       $print_feature"
 		done
 	done
 	echo >&2
@@ -210,6 +216,7 @@ function execute_setup() {
 	return $rc
 }
 
+
 # process all fragments
 FRAGMENTS_BBLAYERS=""
 FRAGMENTS_LOCALCONF=""
@@ -240,6 +247,31 @@ function process_fragments() {
 	done
 }
 
+function containsFeature () {
+  for feature in $1; do
+    [[ "$feature" == "$2" ]] && return 1;
+  done;
+  return 0;
+}
+
+function find_feature_dependency() {
+	res_dep_features=""
+	featuredir=$(find_feature_dir $1)
+	full_feature=$2;
+	if [ -e $featuredir/included.dep ]; then
+		dep_features="$(cat $featuredir/included.dep)"
+		for dep_feature in $dep_features; do
+			full_feature="$full_feature $res_dep_features"
+			res_dep_features="$res_dep_features $dep_feature"
+			if  containsFeature $dep_feature $full_feature ; then
+				res_dep_features="$res_dep_features $(find_feature_dependency $dep_feature $full_feature)"
+			fi;
+		done;
+	fi;
+	echo "$res_dep_features";
+	return 0;
+}
+
 GLOBAL_ARGS=( "$@" )
 debug "Parsing arguments: $@"
 TEMP=$(getopt -o m:b:s:fvdh --long machine:,builddir:,script:,force,verbose,debug,help -n $SCRIPT -- "$@")
@@ -287,6 +319,14 @@ find_machine_dir $MACHINE >/dev/null || error "Machine '$MACHINE' not found in [
 debug "validating features list"
 validate_features
 
+TMP_FEATURES="";
+for FEATURE in $FEATURES;do
+    TMP_FEATURES="$TMP_FEATURES $FEATURE"
+    TMP_FEATURES="$TMP_FEATURES $(find_feature_dependency $FEATURE $TMP_FEATURES)"
+done
+FEATURES=$TMP_FEATURES
+echo "Features used: $FEATURES"
+
 # validate the features
 for f in $FEATURES; do
 	debug "validating feature $f"
@@ -373,17 +413,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)
 }