Re: [PATCH OSSTEST v5 00/13] support for ARM32 arndale and cubietruck platforms

[Ian Campbell <Ian.Campbell@citrix.com>]

On Thu, 2015-01-22 at 15:52 +0000, Ian Campbell wrote:
> Pushing the ~1 to the output will force a test run, once that is done I
> will push the osstest patches.

Actually using the result will require me to push this along with the
main series.

8<-------

>From ba72d891c2d97991a4b00d8958883d17e4bc16d1 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@citrix.com>
Date: Thu, 22 Jan 2015 15:53:35 +0000
Subject: [PATCH] Switch ARM testing back to linux-arm-xen branch.

The cubietruck and arndale boards need a newer kernel than our current
baseline of 3.14. Therefore switch all ARM testing to the
linux-arm-kernel branch which has been moved up to test v3.16.

This effectively reverts commit 38b2fe2020883 "Switch armhf to use
common default Linux."

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 mfi-common | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/mfi-common b/mfi-common
index e167606..7ccff40 100644
--- a/mfi-common
+++ b/mfi-common
@@ -73,6 +73,10 @@ 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
       "
@@ -81,15 +85,12 @@ 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}}
       "
-    fi
+      ;;
+    esac
 
     case "$arch" in
     *)     suite=$defsuite;;
-- 
2.1.4