From patchwork Fri May 23 09:27:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 30683 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f198.google.com (mail-ie0-f198.google.com [209.85.223.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 346B620369 for ; Fri, 23 May 2014 09:30:03 +0000 (UTC) Received: by mail-ie0-f198.google.com with SMTP id tp5sf22231645ieb.5 for ; Fri, 23 May 2014 02:30:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:message-id:from:to:date:in-reply-to :references:organization:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-post:list-help:list-subscribe:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:list-archive:content-type:content-transfer-encoding; bh=yTbYa/HeAKQ7E36Y6lrGbV+iVhFzY+PCpL6/nHqLorg=; b=WJx5EuCDraxffQiir7LIVOV6eXXFLtO/7lf5qMoMlhnYlmDqeCmJalpsseUvrxrSfa TXD7CTUalkYiMQ8vANibv/pVk/5Y5xeDslLVMzEwAM6D6D0oiSZjsUuBRE4XMVZgZtVa pMRAEQv/S9sypVwFK5iltXjHb3LSEM5opFzjZMifzrVKqgmU+xvg7vEhKfHZgP/BWFM7 0M+FOKuXj8kImtSmRZgZREbrbsOR68YOw/LKATJUhbmQsSW3udPZO/152Bnmn04vIBSa iySq/+JnszEMSQUao4WxH7tnmUUDsxqR6/47QlZIK0ZK/kbQeZwxMxGE9FsclekZNip1 gLjg== X-Gm-Message-State: ALoCoQlsW60TOsXppuYnkmLWcNam9oiNIBKwbflDPZ2WCZZBwDv+11cgC0x1ytHBl8qZkm5zuQMZ X-Received: by 10.42.62.11 with SMTP id w11mr1475855ich.29.1400837402637; Fri, 23 May 2014 02:30:02 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.21.85 with SMTP id 79ls1666477qgk.41.gmail; Fri, 23 May 2014 02:30:02 -0700 (PDT) X-Received: by 10.220.92.193 with SMTP id s1mr840662vcm.34.1400837402539; Fri, 23 May 2014 02:30:02 -0700 (PDT) Received: from mail-ve0-f171.google.com (mail-ve0-f171.google.com [209.85.128.171]) by mx.google.com with ESMTPS id vq3si1326616vdc.11.2014.05.23.02.30.02 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 23 May 2014 02:30:02 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.171 as permitted sender) client-ip=209.85.128.171; Received: by mail-ve0-f171.google.com with SMTP id oz11so5957261veb.30 for ; Fri, 23 May 2014 02:30:02 -0700 (PDT) X-Received: by 10.58.161.101 with SMTP id xr5mr380415veb.36.1400837402419; Fri, 23 May 2014 02:30:02 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp15985vcb; Fri, 23 May 2014 02:30:02 -0700 (PDT) X-Received: by 10.224.67.201 with SMTP id s9mr4478720qai.29.1400837401993; Fri, 23 May 2014 02:30:01 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id p10si2789350qci.12.2014.05.23.02.30.01 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 23 May 2014 02:30:01 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WnllI-0005mS-RX; Fri, 23 May 2014 09:27:36 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WnllH-0005mN-Jr for xen-devel@lists.xenproject.org; Fri, 23 May 2014 09:27:35 +0000 Received: from [85.158.139.211:14207] by server-14.bemta-5.messagelabs.com id 17/37-15696-6841F735; Fri, 23 May 2014 09:27:34 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1400837252!5966847!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30282 invoked from network); 23 May 2014 09:27:34 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-5.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 23 May 2014 09:27:34 -0000 X-IronPort-AV: E=Sophos;i="4.98,892,1392163200"; d="scan'208";a="134269043" Received: from accessns.citrite.net (HELO FTLPEX01CL03.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 23 May 2014 09:27:32 +0000 Received: from kazak.uk.xensource.com (10.80.2.80) by FTLPEX01CL03.citrite.net (10.13.107.80) with Microsoft SMTP Server id 14.3.181.6; Fri, 23 May 2014 05:27:31 -0400 Message-ID: <1400837250.18336.8.camel@kazak.uk.xensource.com> From: Ian Campbell To: Jan Beulich Date: Fri, 23 May 2014 10:27:30 +0100 In-Reply-To: <1400836274.18336.4.camel@kazak.uk.xensource.com> References: <537F0C310200007800015333@mail.emea.novell.com> <1400836274.18336.4.camel@kazak.uk.xensource.com> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.12.1-1 MIME-Version: 1.0 X-Originating-IP: [10.80.2.80] X-DLP: MIA2 Cc: xen-devel , ian.jackson@eu.citrix.com Subject: Re: [Xen-devel] [xen-4.3-testing test] 26419: regressions - FAIL X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ian.campbell@citrix.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.171 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: On Fri, 2014-05-23 at 10:11 +0100, Ian Campbell wrote: > I'll investigate! I was just stupid, we are using the wrong URL for everything. 8<----------------------- >From 3e295dffbaffc4b464154049725224aefba6b5f9 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Fri, 23 May 2014 10:26:26 +0100 Subject: [PATCH] cr-daily-branch: Only set TREE_SEABIOS for seabios flights For all other flights we want to use the Config.mk settings. Signed-off-by: Ian Campbell --- ap-common | 2 +- ap-fetch-version | 2 +- ap-print-url | 2 +- cr-daily-branch | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ap-common b/ap-common index b4b3310..bca0fea 100644 --- a/ap-common +++ b/ap-common @@ -47,7 +47,7 @@ : ${TREE_RUMPUSERXEN_RUMPSRC:=https://github.com/rumpkernel/rumpkernel-netbsd-src} : ${TREEVCS_RUMPUSERXEN_RUMPSRC:=git} -: ${TREE_SEABIOS:=git://git.seabios.org/seabios.git} +: ${TREE_SEABIOS_UPSTREAM:=git://git.seabios.org/seabios.git} : ${PUSH_TREE_SEABIOS:=$XENBITS:/home/xen/git/osstest/seabios.git} : ${BASE_TREE_SEABIOS:=git://xenbits.xen.org/osstest/seabios.git} diff --git a/ap-fetch-version b/ap-fetch-version index 638ab6d..9c189b4 100755 --- a/ap-fetch-version +++ b/ap-fetch-version @@ -87,7 +87,7 @@ rumpuserxen) ;; seabios) repo_tree_rev_fetch_git seabios \ - $TREE_SEABIOS master $LOCALREV_SEABIOS + $TREE_SEABIOS_UPSTREAM master $LOCALREV_SEABIOS ;; osstest) if [ "x$OSSTEST_USE_HEAD" != "xy" ] ; then diff --git a/ap-print-url b/ap-print-url index 077cdff..a14d2a6 100755 --- a/ap-print-url +++ b/ap-print-url @@ -59,7 +59,7 @@ rumpuserxen) echo $TREE_RUMPUSERXEN ;; seabios) - echo $TREE_SEABIOS + echo $TREE_SEABIOS_UPSTREAM ;; osstest) echo none:; diff --git a/cr-daily-branch b/cr-daily-branch index f280ba7..1514397 100755 --- a/cr-daily-branch +++ b/cr-daily-branch @@ -138,6 +138,8 @@ if [ "x$REVISION_LINUX_ARM" = x ]; then fi if [ "x$REVISION_SEABIOS" = x ]; then if [ "x$tree" = "xseabios" ]; then + TREE_SEABIOS=$TREE_SEABIOS_UPSTREAM + export TREE_SEABIOS determine_version REVISION_SEABIOS seabios export REVISION_SEABIOS else