From patchwork Tue Feb 11 12:41:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 24448 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f197.google.com (mail-ve0-f197.google.com [209.85.128.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C25FA203F3 for ; Tue, 11 Feb 2014 12:43:45 +0000 (UTC) Received: by mail-ve0-f197.google.com with SMTP id oz11sf18762501veb.4 for ; Tue, 11 Feb 2014 04:43:44 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references: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=Ewv68sWRggvnGrYl+JO4zteJG5s2BpcJruRrud6gRB8=; b=SMDbG89kiwidtiGFmFLo7Ojt/DLlvAGK1dDeVXScLwlegKY6odjPqSZtl3p2LaESdc yaShsOXm/iWxhWigxpRwmxDl+MBUdzV08TsOT83RGpSUY0OF0l3QjZaXuGXgutDH6O8l 4B/QGBU3Wx4Wud6zLrFrVaHMjQqQPWqv9dkxIjuGWtIkIrczy51KCCNLP8jvQAOw3I9l 1Lp2BE+SGIsKRSJGUVs5qQ9admyeYVDfaG9hztUOhLuL2QwNiN0KVyxet4GFHC21n8q6 sgTJKnWgsM2Ok0xbWjXdCecxLJ2blpCQIeKfCmxkTe2ttRAsJpjS5TpuYKEN9aG/2a8o f/LA== X-Gm-Message-State: ALoCoQmC0PETDo3Io8MFU/uo4q8CDH86Fccmj9n2sb6DUS1pAtsTE5tOD/T5m7GEPiT+F5MtqH7v X-Received: by 10.236.61.170 with SMTP id w30mr2896288yhc.20.1392122624903; Tue, 11 Feb 2014 04:43:44 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.28.162 with SMTP id 31ls600610qgz.50.gmail; Tue, 11 Feb 2014 04:43:44 -0800 (PST) X-Received: by 10.221.55.199 with SMTP id vz7mr95881vcb.40.1392122624797; Tue, 11 Feb 2014 04:43:44 -0800 (PST) Received: from mail-vb0-f47.google.com (mail-vb0-f47.google.com [209.85.212.47]) by mx.google.com with ESMTPS id a15si5854083vew.83.2014.02.11.04.43.44 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 11 Feb 2014 04:43:44 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.47 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.47; Received: by mail-vb0-f47.google.com with SMTP id p6so5838438vbe.34 for ; Tue, 11 Feb 2014 04:43:44 -0800 (PST) X-Received: by 10.58.132.203 with SMTP id ow11mr28664050veb.1.1392122624713; Tue, 11 Feb 2014 04:43:44 -0800 (PST) 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.174.196 with SMTP id u4csp243302vcz; Tue, 11 Feb 2014 04:43:44 -0800 (PST) X-Received: by 10.58.248.5 with SMTP id yi5mr92421vec.42.1392122624142; Tue, 11 Feb 2014 04:43:44 -0800 (PST) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id rb4si2180798vec.136.2014.02.11.04.43.43 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 11 Feb 2014 04:43:44 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xen.org designates 50.57.142.19 as permitted sender) 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 1WDCf7-0002iE-RU; Tue, 11 Feb 2014 12:42:05 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDCf6-0002i0-Nb for xen-devel@lists.xen.org; Tue, 11 Feb 2014 12:42:04 +0000 Received: from [85.158.143.35:18301] by server-3.bemta-4.messagelabs.com id 5F/7B-11539-B9A1AF25; Tue, 11 Feb 2014 12:42:03 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1392122521!4812911!2 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21584 invoked from network); 11 Feb 2014 12:42:03 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-14.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 11 Feb 2014 12:42:03 -0000 X-IronPort-AV: E=Sophos;i="4.95,825,1384300800"; d="scan'208";a="101578912" Received: from accessns.citrite.net (HELO FTLPEX01CL02.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 11 Feb 2014 12:42:00 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.13.107.79) with Microsoft SMTP Server id 14.2.342.4; Tue, 11 Feb 2014 07:42:00 -0500 Received: from spare.cam.xci-test.com ([10.80.2.80] helo=kazak.uk.xensource.com.) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1WDCf2-000856-7V; Tue, 11 Feb 2014 12:42:00 +0000 From: Ian Campbell To: Date: Tue, 11 Feb 2014 12:41:59 +0000 Message-ID: <1392122520-5453-1-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.8.5.2 In-Reply-To: <1392122393.26657.102.camel@kazak.uk.xensource.com> References: <1392122393.26657.102.camel@kazak.uk.xensource.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: Ian Campbell , xen-devel@lists.xen.org Subject: [Xen-devel] [PATCH OSSTEST 1/2] Revert "mfi-common: Only override the pvops kernel repo for linux-arm-xen branch" 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=neutral (google.com: 209.85.212.47 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) 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: This reverts commit a528b10cd6a552e92ed2b1b809c991a421ebdba6. Fixing this in make-flight was incorrect -- make-flight should do as it was told and use the appropriate TREE_LINUX(_ARCH) and REVISION_LINUX(_ARCH) values it is given. The real issue here was that these inputs were bogus for the linux-linus tree when running on armhf and this will be fixed in a followup patch. Signed-off-by: Ian Campbell --- mfi-common | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/mfi-common b/mfi-common index f7f981e..8f56092 100644 --- a/mfi-common +++ b/mfi-common @@ -44,11 +44,6 @@ create_build_jobs () { if [ "x$arch" = xdisable ]; then continue; fi - pvops_kernel=" - tree_linux=$TREE_LINUX - revision_linux=${REVISION_LINUX:-${DEFAULT_REVISION_LINUX}} - " - case "$arch" in armhf) case "$branch" in @@ -64,13 +59,10 @@ create_build_jobs () { xen-4.1-testing) continue;; xen-4.2-testing) continue;; esac - - if [ "$branch" = "linux-arm-xen" ]; then - pvops_kernel=" - tree_linux=$TREE_LINUX_ARM - revision_linux=${REVISION_LINUX_ARM:-${DEFAULT_REVISION_LINUX_ARM}} - " - fi + 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 " @@ -79,6 +71,10 @@ create_build_jobs () { case "$branch" in linux-arm-xen) continue;; esac + pvops_kernel=" + tree_linux=$TREE_LINUX + revision_linux=${REVISION_LINUX:-${DEFAULT_REVISION_LINUX}} + " ;; esac