Add feature shortcuts matching ci system

These features (shortcuts) do activate the feature set for:
 - the changeset builds (agl-ci-change-features)
 - the snapshot builds (agl-ci-snapshot-features)

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

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

diff --git a/templates/feature/agl-ci-change-features/included.inc b/templates/feature/agl-ci-change-features/included.inc
new file mode 100644 (file)
index 0000000..4d528e4
--- /dev/null
+++ b/templates/feature/agl-ci-change-features/included.inc
@@ -0,0 +1 @@
+agl-demo agl-devel agl-netboot agl-sota agl-appfw-smack
\ No newline at end of file

diff --git a/templates/feature/agl-ci-snapshot-features/included.inc b/templates/feature/agl-ci-snapshot-features/included.inc
new file mode 100644 (file)
index 0000000..123de78
--- /dev/null
+++ b/templates/feature/agl-ci-snapshot-features/included.inc
@@ -0,0 +1 @@
+agl-demo agl-devel agl-netboot agl-sota agl-appfw-smack agl-isafw agl-archiver
\ No newline at end of file