X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=scripts%2F.aglsetup_genconfig.bash;h=31520a7cc184d6988768b2203777d4b50fdf7611;hb=9a6b28c8ec3171e2c6852cf73f3f07ecd056c4a1;hp=e73facd11e6388e8c8d49b948f5bc084ea10db08;hpb=7d15e6c0c416b11460c6d7f3aee7aeb2663b13cb;p=AGL%2Fmeta-agl.git

diff --git a/scripts/.aglsetup_genconfig.bash b/scripts/.aglsetup_genconfig.bash
index e73facd11..31520a7cc 100755
--- a/scripts/.aglsetup_genconfig.bash
+++ b/scripts/.aglsetup_genconfig.bash
@@ -123,6 +123,24 @@ function find_feature_dir() {
 	return 1
 }
 
+function process-feature-shortcuts() {
+    TOCHECK=$1
+    debug "processing feature shortcut $TOCHECK"
+    if $(echo "$FEATURES" | grep -q "$TOCHECK" 2>&1 ) ; then
+	featuredir=$(find_feature_dir $TOCHECK)
+	if test -d $featuredir; then
+	    tmpfeatures="$FEATURES $(cat $featuredir/included.inc)"
+	    tmpfeatures_uniq=$(echo $tmpfeatures | sed -e "s/$TOCHECK//g" -e 's/  / /g' | tr "[:blank:]" "\n" | sort -u )
+	    export FEATURES=$tmpfeatures_uniq
+	    debug "Features used: $FEATURES"
+	else
+	    error "No feature directory with this name: $TOCHECK"
+	    exit 1
+	fi
+    fi
+}
+
+
 function usage() {
     cat <<EOF >&2
 Usage: . $SCRIPT [options] [feature [feature [... ]]]
@@ -172,8 +190,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
@@ -211,6 +234,7 @@ function execute_setup() {
 	return $rc
 }
 
+
 # process all fragments
 FRAGMENTS_BBLAYERS=""
 FRAGMENTS_LOCALCONF=""
@@ -241,6 +265,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 -- "$@")
@@ -275,6 +324,9 @@ verbose "Command line arguments: ${GLOBAL_ARGS[@]}"
 
 # the remaining args are the features
 FEATURES="$@"
+process-feature-shortcuts agl-all-features
+process-feature-shortcuts agl-ci-change-features
+process-feature-shortcuts agl-ci-snapshot-features
 
 # validate the machine list
 debug "validating machines list"
@@ -288,13 +340,13 @@ 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
+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