From e21625f79d33fa41d6fc351b37d591a403e99163 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Tue, 17 Nov 2015 17:13:46 +0000 Subject: [PATCH] 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 Acked-by: Ian Jackson --- make-flight | 3 +++ mfi-common | 17 ----------------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/make-flight b/make-flight index 42a903e..6b2b3ea 100755 --- 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 44cd13b..4ed040e 100644 --- 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}} -- 2.39.5