Re: [PATCH OSSTEST 2/2] Switch armhf to use common default Linux.

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

On Thu, 2014-09-04 at 15:26 +0100, Ian Campbell wrote:

I should also have CCd Stefano as the ARM Linux maintainer and
maintainer of the special branch which ARM uses today. Done

> 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>
> ---
>  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;;