make-flight: move in-lined branch vs arch filtering into callbacks

No change to the output of standalone-generate-dump-flight-runvars

The inlined xenbranch vs arch filters remain where they are since they
are common (in that they reflect the addition and removal of arches)
and apply equally to all make-*-flight.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/make-flight b/make-flight
index 42a903e180d1540b007ab88f179fe618ad902f64..6b2b3eabf74227461b185d5dc75382ffb0177b32 100755 (executable)
--- a/make-flight
+++ b/make-flight
@@ -147,6 +147,9 @@ arch_branch_filter_callback () {
         qemu-upstream-4.2-testing) return 1;;
         qemu-upstream-4.3-testing) return 1;;
         qemu-upstream-4.4-testing) return 1;;
+        rumpuserxen) return 1;;
+        seabios) return 1;;
+        ovmf) return 1;;
         esac
         ;;
   i386|amd64)

diff --git a/mfi-common b/mfi-common
index 44cd13b6e5d9d877faa91e0e89d5b628f8cc91fd..4ed040e0587e250c7b9ee285a026dc217cffa5d1 100644 (file)
--- a/mfi-common
+++ b/mfi-common
@@ -93,20 +93,6 @@ create_build_jobs () {
 
     case "$arch" in
     armhf)
-      case "$branch" in
-      linux-3.0) continue;;
-      linux-3.4) continue;;
-      linux-3.10) continue;;
-      linux-3.14) continue;;
-      linux-mingo-tip-master) continue;;
-      linux-*) ;;
-      qemu-upstream-4.2-testing) continue;;
-      qemu-upstream-4.3-testing) continue;;
-      qemu-upstream-4.4-testing) continue;;
-      rumpuserxen) continue;;
-      seabios) continue;;
-      ovmf) continue;;
-      esac
       case "$xenbranch" in
       xen-3.*-testing) continue;;
       xen-4.0-testing) continue;;
@@ -122,9 +108,6 @@ create_build_jobs () {
       "
       ;;
     *)
-      case "$branch" in
-      linux-arm-xen) continue;;
-      esac
       pvops_kernel="
         tree_linux=$TREE_LINUX
         revision_linux=${REVISION_LINUX:-${DEFAULT_REVISION_LINUX}}