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

diff --git a/scripts/.aglsetup_genconfig.bash b/scripts/.aglsetup_genconfig.bash
index 31520a7cc..af2b7473b 100755
--- a/scripts/.aglsetup_genconfig.bash
+++ b/scripts/.aglsetup_genconfig.bash
@@ -123,24 +123,6 @@ 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 [... ]]]
@@ -324,9 +306,6 @@ 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"
@@ -345,8 +324,8 @@ 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"
+# remove duplicate features if any
+FEATURES=$(for x in $TMP_FEATURES; do echo $x; done | sort -u | awk '{printf("%s ",$1);}')
 
 # validate the features
 for f in $FEATURES; do