From patchwork Thu Mar 20 15:56:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 26734 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f72.google.com (mail-oa0-f72.google.com [209.85.219.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A500420143 for ; Thu, 20 Mar 2014 15:58:12 +0000 (UTC) Received: by mail-oa0-f72.google.com with SMTP id eb12sf4204604oac.3 for ; Thu, 20 Mar 2014 08:58:12 -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=yS8w5+Tm5cbmTgfrxmkfhN6rJbcF+pFSrIdYO5tfOGc=; b=f0kVKwqFm3ixJVl8DtITMxuJDnLhr6qU5RCvse3eC/fOOPuKsFeEUqHYixLjaO+3A7 7Cj6BUTuZ/3AOvEO4y/+zWow32WfsTUvVwvcYFJYNjGXwUlfgwbRV/keGFEGk1qgwPkw k/G29GRNr95M12flTa59jB+eNaoH1BNmrG87KNw7gXXZLjCJLVIpGoWhpgUcVywosEko mBcVzYwX8vCl1FgagDYusrkX/pUKvc8P8vVH2kkpgKlo+Z8VmCbCgfy39bx32bLbcoaL IVN7XPGilYVl5z6BUOb2l/Dat57mbMcC2DFJtCz+qDedEXhbMM/bTIKDR9jXLzqonMGl rPgw== X-Gm-Message-State: ALoCoQmJGwIQbAukl7/yy80Uez4aU8fWMDgwjUCHrkDQbOMvUi2Jzef2gT/V7LldKshWadS8Zrr9 X-Received: by 10.182.153.68 with SMTP id ve4mr3950439obb.39.1395331092034; Thu, 20 Mar 2014 08:58:12 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.91.120 with SMTP id y111ls279073qgd.0.gmail; Thu, 20 Mar 2014 08:58:11 -0700 (PDT) X-Received: by 10.221.55.199 with SMTP id vz7mr1092866vcb.40.1395331091864; Thu, 20 Mar 2014 08:58:11 -0700 (PDT) Received: from mail-vc0-f169.google.com (mail-vc0-f169.google.com [209.85.220.169]) by mx.google.com with ESMTPS id 2si503515vcd.203.2014.03.20.08.58.11 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 20 Mar 2014 08:58:11 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.169 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.169; Received: by mail-vc0-f169.google.com with SMTP id ik5so1195444vcb.14 for ; Thu, 20 Mar 2014 08:58:11 -0700 (PDT) X-Received: by 10.220.109.1 with SMTP id h1mr21530307vcp.20.1395331091770; Thu, 20 Mar 2014 08:58:11 -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 i9csp399297vck; Thu, 20 Mar 2014 08:58:11 -0700 (PDT) X-Received: by 10.224.160.142 with SMTP id n14mr52172552qax.17.1395331091225; Thu, 20 Mar 2014 08:58:11 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id h5si960620qas.4.2014.03.20.08.58.10 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 20 Mar 2014 08:58:11 -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 1WQfKc-0007Bp-JA; Thu, 20 Mar 2014 15:56:34 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WQfKb-0007BI-7j for xen-devel@lists.xen.org; Thu, 20 Mar 2014 15:56:33 +0000 Received: from [85.158.137.68:21864] by server-9.bemta-3.messagelabs.com id 60/B3-30063-0BF0B235; Thu, 20 Mar 2014 15:56:32 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1395330989!1959186!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 29935 invoked from network); 20 Mar 2014 15:56:31 -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:31 -0000 X-IronPort-AV: E=Sophos;i="4.97,695,1389744000"; d="scan'208";a="113313008" 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-9k; Thu, 20 Mar 2014 15:56:28 +0000 From: Ian Campbell To: Date: Thu, 20 Mar 2014 15:56:26 +0000 Message-ID: <1395330988-4613-2-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 2/4] import enable-xen-config from xen.git, use for ts-kernel-build 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.220.169 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: I plan to remove it from xen.git. Take the version from a03984e7bcdf which hasn't changed since 8dedf6431393 in 2010. Update ts-kernel-build to not require xen.git. config_intree_buildconfigs was unused so remove it. Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- v2: Import into a here document. Placed at the end since it is long.` --- mfi-common | 2 - ts-kernel-build | 155 +++++++++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 136 insertions(+), 21 deletions(-) diff --git a/mfi-common b/mfi-common index 52ed4d4..df7f8b0 100644 --- a/mfi-common +++ b/mfi-common @@ -153,11 +153,9 @@ create_build_jobs () { ./cs-job-create $flight build-$arch-pvops build-kern \ arch=$arch kconfighow=xen-enable-xen-config \ - tree_xen=$TREE_XEN \ $RUNVARS $BUILD_RUNVARS $BUILD_LINUX_RUNVARS $arch_runvars \ $suite_runvars \ host_hostflags=$build_hostflags \ - revision_xen=$REVISION_XEN \ $pvops_kernel $pvops_kconfig_overrides \ ${TREEVCS_LINUX:+treevcs_linux=}${TREEVCS_LINUX} \ tree_linuxfirmware=$TREE_LINUXFIRMWARE \ diff --git a/ts-kernel-build b/ts-kernel-build index 05d9e96..df31709 100755 --- a/ts-kernel-build +++ b/ts-kernel-build @@ -38,11 +38,11 @@ my $archparms = { 'amd64' => { DefConfig => 'defconfig', KernelImage => 'arch/x86/boot/bzImage' } }; +sub enable_xen_config (); + sub checkout () { target_cmd($ho, "rm -rf $builddir && mkdir $builddir", 600); - build_clone($ho, 'xen', $builddir, 'xen-unstable'); - build_clone($ho, 'linux', $builddir, 'linux'); if (length($r{tree_pq_linux})) { @@ -250,8 +250,9 @@ $config_features $config_runvars END + target_putfilecontents_stash($ho,1000,enable_xen_config(),"$builddir/enable-xen-config"); + target_cmd_build($ho, 1000, $builddir, <enable-device-configs - ed <$edscript enable-device-configs - chmod +x enable-device-configs - cd linux - make -f buildconfigs/Rules.mk defconfig " 1>&2 + exit 1 +fi + +CONFIG=$1 + +setopt() +{ + OPTION=$1 + VALUE=$2 + + # First remove any existing instances of this option + sed -e "s/^# ${OPTION} is not set$//g ; s/^${OPTION}=.*$//g" -i "${CONFIG}" + + # Then append the new value + case ${VALUE} in + n) echo "# ${OPTION} is not set" >> "${CONFIG}" ;; + y|m|*) echo "${OPTION}=${VALUE}" >> "${CONFIG}" ;; + esac +} + +setopt CONFIG_PARAVIRT y +setopt CONFIG_PARAVIRT_DEBUG y +setopt CONFIG_PARAVIRT_GUEST y +setopt CONFIG_PARAVIRT_SPINLOCKS y + +setopt CONFIG_XEN y +setopt CONFIG_XEN_BLKDEV_FRONTEND y +setopt CONFIG_XEN_NETDEV_FRONTEND y +setopt CONFIG_XEN_KBDDEV_FRONTEND y +setopt CONFIG_XEN_FBDEV_FRONTEND y +setopt CONFIG_XEN_PCIDEV_FRONTEND y +setopt CONFIG_XEN_BALLOON y +setopt CONFIG_XEN_SCRUB_PAGES y +setopt CONFIG_XEN_DEV_EVTCHN y +setopt CONFIG_XEN_BACKEND y +setopt CONFIG_XEN_BLKDEV_BACKEND y +setopt CONFIG_XEN_BLKDEV_TAP y +setopt CONFIG_XEN_NETDEV_BACKEND y +setopt CONFIG_XEN_PCIDEV_BACKEND y +setopt CONFIG_XEN_PCIDEV_BACKEND_VPCI y +setopt CONFIG_XEN_PCIDEV_BACKEND_PASS n +setopt CONFIG_XEN_PCIDEV_BACKEND_SLOT n +setopt CONFIG_XEN_PCIDEV_BE_DEBUG n +setopt CONFIG_XENFS y +setopt CONFIG_XEN_COMPAT_XENFS y +setopt CONFIG_XEN_PCI_PASSTHROUGH y +setopt CONFIG_HVC_XEN y +setopt CONFIG_XEN_MAX_DOMAIN_MEMORY 32 +setopt CONFIG_XEN_DEBUG_FS y +setopt CONFIG_XEN_DOM0 y +setopt CONFIG_XEN_SYS_HYPERVISOR y +setopt CONFIG_XEN_GNTDEV y +setopt CONFIG_XEN_PLATFORM_PCI y + +setopt CONFIG_VMI y +setopt CONFIG_TUN y + +setopt CONFIG_KVM y +setopt CONFIG_KVM_INTEL y +setopt CONFIG_KVM_AMD y +setopt CONFIG_KVM_CLOCK y +setopt CONFIG_KVM_GUEST n +setopt CONFIG_KVM_TRACE n + +setopt CONFIG_LGUEST n + +setopt CONFIG_LOCALVERSION_AUTO n + +setopt CONFIG_BRIDGE y + +setopt CONFIG_DEBUG_STACK_USAGE n + +setopt CONFIG_MEMORY_HOTPLUG y +setopt CONFIG_MEMORY_HOTREMOVE y + +setopt CONFIG_MIGRATION n + +setopt CONFIG_ACPI_HOTPLUG_MEMORY n + +# Should all be set one way or another in defconfig but aren't +setopt CONFIG_NUMA n +setopt CONFIG_X86_VSMP n +setopt CONFIG_X86_UV n +setopt CONFIG_CALGARY_IOMMU n +setopt CONFIG_AMD_IOMMU n +setopt CONFIG_MAXSMP n +setopt CONFIG_SPARSEMEM_VMEMMAP n +setopt CONFIG_I7300_IDLE n +setopt CONFIG_DMAR n +setopt CONFIG_INTR_REMAP n +setopt CONFIG_GFS2_FS n +setopt CONFIG_IOMMU_DEBUG n +setopt CONFIG_X86_MCE_INTEL n +setopt CONFIG_X86_MCE_AMD n +setopt CONFIG_CRYPTO_AES_NI_INTEL n +setopt CONFIG_CISS_SCSI_TAPE n + +setopt CONFIG_FUSION y +setopt CONFIG_FUSION_SPI m +setopt CONFIG_FUSION_SAS m +setopt CONFIG_FUSION_FC m +setopt CONFIG_FUSION_MAX_SGE 128 +setopt CONFIG_FUSION_CTL n +setopt CONFIG_FUSION_LOGGING n + +setopt CONFIG_BLK_CPQ_CISS_DA m + +case ${XEN_TARGET_ARCH} in + x86_32) setopt CONFIG_64BIT n ;; + x86_64) + setopt CONFIG_64BIT y + setopt CONFIG_IA32_EMULATION y + setopt CONFIG_IA32_AOUT n + setopt CONFIG_CRYPTO_AES_X86_64 n + setopt CONFIG_CRYPTO_SALSA20_X86_64 n + setopt CONFIG_CRYPTO_TWOFISH_X86_64 n + ;; + *) ;; +esac + +exit 0 +END +}