Switch armhf to use common default Linux.

Previous we had a v3.13 based branch which was used for ARM (because
v3.4 was too old). Now that the default is v3.14 we can use it.

standalone-generate-dump-flight-runvars before and after shows the
build-armhf-pvops jobs' linux_revision runvar changing from
95bfbee422b9b1cfe8c2d2e27edf17ce1cc99e04 (v3.13-63-g95bfbee) to
946de0e6b6ed49eacb03e3cddfcb1d774d6378ed (v3.14.17) for these branches:

	libvirt
	osstest
	qemu-mainline
	qemu-upstream-unstable
	xen-4.3-testing
	xen-4.4-testing
	xen-unstable

This is as expected.

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

diff --git a/mfi-common b/mfi-common
index afb6239c6f6653af9918f7b1efda53788b2cc94d..5c4f5d5192611321e00a6742f3b0636a65a2f7ef 100644 (file)
--- a/mfi-common
+++ b/mfi-common
@@ -73,10 +73,6 @@ create_build_jobs () {
       xen-4.1-testing) continue;;
       xen-4.2-testing) continue;;
       esac
-      pvops_kernel="
-        tree_linux=$TREE_LINUX_ARM
-        revision_linux=${REVISION_LINUX_ARM:-${DEFAULT_REVISION_LINUX_ARM}}
-      "
       pvops_kconfig_overrides="
         kconfig_override_y=CONFIG_EXT4_FS
       "
@@ -85,12 +81,15 @@ create_build_jobs () {
       case "$branch" in
       linux-arm-xen) continue;;
       esac
+      ;;
+    esac
+
+    if [ "x$pvops_kernel" = x ] ; then
       pvops_kernel="
         tree_linux=$TREE_LINUX
         revision_linux=${REVISION_LINUX:-${DEFAULT_REVISION_LINUX}}
       "
-      ;;
-    esac
+    fi
 
     case "$arch" in
     *)     suite=$defsuite;;