Convert feature.inc to feature.dep

This converts the included features used for CI purposes to use the
dependency format introduced.

Change-Id: I405af9ffbd6954d0e78b5f738e762a80687337d7
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>

diff --git a/scripts/.aglsetup_genconfig.bash b/scripts/.aglsetup_genconfig.bash
index 31520a7..285ecee 100755 (executable)
--- 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"

diff --git a/templates/feature/agl-ci-change-features/included.inc b/templates/feature/agl-ci-change-features/included.dep
similarity index 100%
rename from templates/feature/agl-ci-change-features/included.inc
rename to templates/feature/agl-ci-change-features/included.dep

diff --git a/templates/feature/agl-ci-snapshot-features/included.inc b/templates/feature/agl-ci-snapshot-features/included.dep
similarity index 100%
rename from templates/feature/agl-ci-snapshot-features/included.inc
rename to templates/feature/agl-ci-snapshot-features/included.dep