From patchwork Thu Mar 20 15:56:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 26736 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ig0-f200.google.com (mail-ig0-f200.google.com [209.85.213.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 889A620143 for ; Thu, 20 Mar 2014 15:58:16 +0000 (UTC) Received: by mail-ig0-f200.google.com with SMTP id h18sf3892247igc.3 for ; Thu, 20 Mar 2014 08:58:16 -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: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=hpTD0hhgOdhYXk6Vz2KeXKeLkK0F7uxKKtWSrOkSRtU=; b=JPIKqcIoDGupeBSOk1YfuSeWWkMCb7BgqN+Vvs/LACweiHB6hepdTRh1Pgxa33pH0l Sya8iO5szbsUEjmBEjJoavN0f6sJcAGA+i8IyHtE1FBnlM1wqMzaBPinRsLmZIFD7zlD BPxWW/jsAY5iClchvTCVYhHkPrLQh/S+18bvZb79xHTr3xKiMswatZm0HfUvF86A/trs qV2Y0+XMl7UemOKc2EC0rDAiJmAGdHQWoZQxbCqBzrV8Q+E+/eEW43pawPXSwpm3QBvM KOYXuh1+BAw51bUEoexjWsdbP0D1/wC1C6J6RPNzRndR1hiHCxKjtA8U7/3z7fqqoTEY 5yBA== X-Gm-Message-State: ALoCoQmjWksezcgnBMZaJ9WKoAQWwGNYlucpCQ/Xj7RNJsEFvXz3wrdgYKwiZ4vNzG0XSACfSXrC X-Received: by 10.43.4.4 with SMTP id oa4mr15192550icb.2.1395331096013; Thu, 20 Mar 2014 08:58:16 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.106.165 with SMTP id e34ls312312qgf.29.gmail; Thu, 20 Mar 2014 08:58:15 -0700 (PDT) X-Received: by 10.220.95.139 with SMTP id d11mr21436958vcn.21.1395331095844; Thu, 20 Mar 2014 08:58:15 -0700 (PDT) Received: from mail-ve0-f170.google.com (mail-ve0-f170.google.com [209.85.128.170]) by mx.google.com with ESMTPS id gq1si510721vec.185.2014.03.20.08.58.15 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 20 Mar 2014 08:58:15 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.170; Received: by mail-ve0-f170.google.com with SMTP id pa12so1177099veb.15 for ; Thu, 20 Mar 2014 08:58:15 -0700 (PDT) X-Received: by 10.58.77.37 with SMTP id p5mr491610vew.62.1395331095766; Thu, 20 Mar 2014 08:58:15 -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.78.9 with SMTP id i9csp399304vck; Thu, 20 Mar 2014 08:58:15 -0700 (PDT) X-Received: by 10.58.37.232 with SMTP id b8mr5570868vek.27.1395331095215; Thu, 20 Mar 2014 08:58:15 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id sv2si526722vdc.129.2014.03.20.08.58.14 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 20 Mar 2014 08:58:15 -0700 (PDT) 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 1WQfKd-0007CD-BT; Thu, 20 Mar 2014 15:56:35 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQfKc-0007BS-22 for xen-devel@lists.xen.org; Thu, 20 Mar 2014 15:56:34 +0000 Received: from [85.158.137.68:50361] by server-10.bemta-3.messagelabs.com id F6/D1-16608-1BF0B235; Thu, 20 Mar 2014 15:56:33 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1395330989!1959186!3 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.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30073 invoked from network); 20 Mar 2014 15:56:32 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-10.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 20 Mar 2014 15:56:32 -0000 X-IronPort-AV: E=Sophos;i="4.97,695,1389744000"; d="scan'208";a="113313009" Received: from accessns.citrite.net (HELO FTLPEX01CL02.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 20 Mar 2014 15:56:29 +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; Thu, 20 Mar 2014 11:56:28 -0400 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 1WQfKW-0006RQ-Dg; Thu, 20 Mar 2014 15:56:28 +0000 From: Ian Campbell To: Date: Thu, 20 Mar 2014 15:56:27 +0000 Message-ID: <1395330988-4613-3-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.8.5.2 In-Reply-To: <1395229554.10203.74.camel@kazak.uk.xensource.com> References: <1395229554.10203.74.camel@kazak.uk.xensource.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: Ian Campbell , xen-devel@lists.xen.org Subject: [Xen-devel] [PATCH OSSTEST v2 3/4] Use ts-kernel-build for build-*-oldkern 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.128.170 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: instead of using the kernel build integration in xen.git, which is going away. There is no difference to the .config produced. No test jobs seem to rely on these kernels so I have not worried about making the contents of dist be identical (specifically the filenames under /boot have lost their -xen suffix) Remove the now unused xen and qemu(u) tree/revision stuff from the jobs' runvars. Add the appropriate kconfighow and kimagefile runvars and implement an appropriate kconfighow handler to use the create_config.sh present in this tree (the xen.git intergration called the same script) If the 2.6.18 build starts to fail, xen-unstable pushes will be broken until they are fixed, as before. Previously such a build failure might be due to changes in xen.git so that was slightly justifiable. But in practice this is quite rare. This situation, while anomalous, is tolerable. Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- v2: stole some of your words for the commit message, I hope I am grasping the correct end of the stick. --- mfi-common | 12 +++--------- ts-kernel-build | 16 ++++++++++++++++ 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/mfi-common b/mfi-common index df7f8b0..2fff802 100644 --- a/mfi-common +++ b/mfi-common @@ -167,18 +167,12 @@ create_build_jobs () { if [ "x$REVISION_LINUX_OLD" != xdisable ]; then - ./cs-job-create $flight build-$arch-oldkern build \ - arch=$arch \ - tree_qemu=$TREE_QEMU \ - tree_qemuu=$TREE_QEMU_UPSTREAM \ - tree_xen=$TREE_XEN \ + ./cs-job-create $flight build-$arch-oldkern build-kern \ + arch=$arch kconfighow=create-config-sh \ + kimagefile=vmlinux \ $RUNVARS $BUILD_RUNVARS $BUILD_LINUX_OLD_RUNVARS \ $arch_runvars $suite_runvars \ host_hostflags=$build_hostflags \ - xen_kernels=linux-2.6-xen \ - revision_xen=$REVISION_XEN \ - revision_qemu=$REVISION_QEMU \ - revision_qemuu=$REVISION_QEMU_UPSTREAM \ tree_linux=http://xenbits.xen.org/linux-2.6.18-xen.hg \ revision_linux=$REVISION_LINUX_OLD diff --git a/ts-kernel-build b/ts-kernel-build index df31709..8618709 100755 --- a/ts-kernel-build +++ b/ts-kernel-build @@ -265,6 +265,22 @@ END # /; } +sub config_create_config_sh () { + die "only x86" unless $r{arch} =~ m/^amd64|i386$/; + + my $xta = $r{arch} eq "amd64" ? "x86_64" : "x86_32"; + + target_cmd_build($ho, 1000, $builddir, <