From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH OSSTEST 2/2] Switch armhf to use common default Linux. Date: Thu, 4 Sep 2014 15:26:50 +0100 Message-ID: <8c7a542846bf1c35cbc769d95023fceb9004d855.1409840810.git.ian.campbell@citrix.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: ian.jackson@eu.citrix.com Cc: Ian Campbell , xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org 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 --- mfi-common | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/mfi-common b/mfi-common index afb6239..5c4f5d5 100644 --- 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;; -- 1.9.0