From patchwork Wed Mar 19 11:47:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 26554 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f199.google.com (mail-ob0-f199.google.com [209.85.214.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4A47A20534 for ; Wed, 19 Mar 2014 11:50:49 +0000 (UTC) Received: by mail-ob0-f199.google.com with SMTP id wo20sf31508011obc.10 for ; Wed, 19 Mar 2014 04:50:48 -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=2vo1Gnu+lOAv2YC8uMomUOcNNI4LFR2QuXqGSzF7VK4=; b=gG4nG96CTHsEr7cggO1vbYT1qs0aKEvRuF50sdoZveKVg6xhI6qToNrVRO/D8JUFjm 57Kw6HSnBZlM9DWS0Qri61FUetSMqNHr+s7Evw1E539Lu0ce7T/ffwvuXAPET97xmVYP G68Fdn2lH9Y4ntfpfE7o183X0PZpba8fn7cpDx/mPCD+NDikrSxRdm1yBj/nrsKXH7p1 uqiI/w8s7h1bNq9mshHsyfpnQU3ZjLVEx89pYVZ6kjE3NosRIUFSnG16pQX4Mle+q62Q 47kQ3HMcn9nO0QzLHJ6O4vYUOK6ILUJh65Lq9Qx3Fk7QBKMDsnFN/k2t2Eiw1V22dCmh 0bmg== X-Gm-Message-State: ALoCoQkvoQ2ScfjHNCxPMN18Zu9bh9zWrU+GIdSDCUfkTiQNRs4U86LyCb9C+WLKeJl6DT+28e1T X-Received: by 10.51.16.65 with SMTP id fu1mr10680010igd.3.1395229848730; Wed, 19 Mar 2014 04:50:48 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.94.210 with SMTP id g76ls2403305qge.69.gmail; Wed, 19 Mar 2014 04:50:48 -0700 (PDT) X-Received: by 10.221.39.138 with SMTP id tm10mr30061000vcb.7.1395229848571; Wed, 19 Mar 2014 04:50:48 -0700 (PDT) Received: from mail-ve0-f178.google.com (mail-ve0-f178.google.com [209.85.128.178]) by mx.google.com with ESMTPS id tz5si3451497vdc.25.2014.03.19.04.50.48 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 19 Mar 2014 04:50:48 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.178 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.178; Received: by mail-ve0-f178.google.com with SMTP id jw12so8527648veb.23 for ; Wed, 19 Mar 2014 04:50:48 -0700 (PDT) X-Received: by 10.58.38.166 with SMTP id h6mr9174668vek.22.1395229848375; Wed, 19 Mar 2014 04:50:48 -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 i9csp292217vck; Wed, 19 Mar 2014 04:50:47 -0700 (PDT) X-Received: by 10.140.51.161 with SMTP id u30mr23167056qga.69.1395229847718; Wed, 19 Mar 2014 04:50:47 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id gq5si10816120qab.51.2014.03.19.04.50.47 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 19 Mar 2014 04:50:47 -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 1WQEyV-0001gj-VJ; Wed, 19 Mar 2014 11:48:00 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQEyU-0001gK-Cs for xen-devel@lists.xen.org; Wed, 19 Mar 2014 11:47:58 +0000 Received: from [85.158.143.35:28358] by server-3.bemta-4.messagelabs.com id F0/E2-13602-DE389235; Wed, 19 Mar 2014 11:47:57 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1395229670!3186470!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.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6376 invoked from network); 19 Mar 2014 11:47:57 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-6.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 19 Mar 2014 11:47:57 -0000 X-IronPort-AV: E=Sophos;i="4.97,685,1389744000"; d="scan'208";a="112814427" Received: from accessns.citrite.net (HELO FTLPEX01CL03.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 19 Mar 2014 11:47:56 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.13.107.80) with Microsoft SMTP Server id 14.2.342.4; Wed, 19 Mar 2014 07:47:56 -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 1WQEyR-0006YN-UL; Wed, 19 Mar 2014 11:47:55 +0000 From: Ian Campbell To: Date: Wed, 19 Mar 2014 11:47:54 +0000 Message-ID: <1395229675-13658-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: MIA1 Cc: Ian Campbell , xen-devel@lists.xen.org Subject: [Xen-devel] [PATCH OSSTEST 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.178 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) Signed-off-by: Ian Campbell --- I guess these are build tests only, but they sem to only be used in the osstest flights. Not sure if that is deliberate. --- 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 f80d857..cfb9f5c 100755 --- a/ts-kernel-build +++ b/ts-kernel-build @@ -263,6 +263,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, <