From patchwork Wed Feb 19 10:59: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: 24944 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f199.google.com (mail-vc0-f199.google.com [209.85.220.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 654DE201EE for ; Wed, 19 Feb 2014 11:01:30 +0000 (UTC) Received: by mail-vc0-f199.google.com with SMTP id hu8sf302862vcb.2 for ; Wed, 19 Feb 2014 03:01:29 -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: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=erM0De1SLl7KLkPUB/3cYfSvltX/97IVycKO2RmoJ6M=; b=A95ulUnPURUjTTp9ReETBH7sKV/sfGR+IHpHOnIHROk2yo89lZiJqpTvF6eY7c0QPK ge4mnScjQwAJhvlzbLuCT7kdh0xwTQek7b5MoUjIplZ2dhmcgguo8xEdvoEtZML5AINY 3FrUooZvCIbiQlsmCSogwi/ZGe1gIqD1aEYr/lLyCRj9dHEM8B7F9ehbi/q0AKUBX8XY 8WxTTrucJjcnXphSAeC5dHm3GP5niefeuO5c8EmqEe94G+8Lkw7LtszAijg052cLAPYL 3n2QdbZ2OIi7sC1CWvigoQlM6w9cE5slbyB08Gxm3GnmdRb9swE5nviSMTvO5MHf0vaU /7dw== X-Gm-Message-State: ALoCoQmZyKmpBoW+BAhEBSMqXTRqgycMckU5RbCN7ZJd1qtqrdmU3609lB2uH4YjesAKBHQmQPhq X-Received: by 10.236.120.11 with SMTP id o11mr3356714yhh.39.1392807689661; Wed, 19 Feb 2014 03:01:29 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.80.98 with SMTP id b89ls66226qgd.9.gmail; Wed, 19 Feb 2014 03:01:29 -0800 (PST) X-Received: by 10.220.47.10 with SMTP id l10mr94320vcf.56.1392807689563; Wed, 19 Feb 2014 03:01:29 -0800 (PST) Received: from mail-vc0-f173.google.com (mail-vc0-f173.google.com [209.85.220.173]) by mx.google.com with ESMTPS id n15si6615232vcy.102.2014.02.19.03.01.29 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 19 Feb 2014 03:01:29 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.173 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.173; Received: by mail-vc0-f173.google.com with SMTP id ld13so203570vcb.18 for ; Wed, 19 Feb 2014 03:01:29 -0800 (PST) X-Received: by 10.52.23.68 with SMTP id k4mr17693396vdf.24.1392807689461; Wed, 19 Feb 2014 03:01:29 -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 u4csp288158vcz; Wed, 19 Feb 2014 03:01:29 -0800 (PST) X-Received: by 10.140.86.202 with SMTP id p68mr688923qgd.81.1392807689009; Wed, 19 Feb 2014 03:01:29 -0800 (PST) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id v8si11734640qab.145.2014.02.19.03.01.28 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 19 Feb 2014 03:01:29 -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 1WG4sH-0002rc-Uj; Wed, 19 Feb 2014 10:59:33 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WG4sG-0002rX-B9 for xen-devel@lists.xenproject.org; Wed, 19 Feb 2014 10:59:32 +0000 Received: from [85.158.143.35:54383] by server-1.bemta-4.messagelabs.com id 37/5A-31661-39E84035; Wed, 19 Feb 2014 10:59:31 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1392807569!6763055!1 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 23755 invoked from network); 19 Feb 2014 10:59:30 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-12.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 19 Feb 2014 10:59:30 -0000 X-IronPort-AV: E=Sophos;i="4.97,504,1389744000"; d="scan'208";a="103846279" Received: from accessns.citrite.net (HELO FTLPEX01CL01.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 19 Feb 2014 10:59:29 +0000 Received: from [10.80.2.80] (10.80.2.80) by FTLPEX01CL01.citrite.net (10.13.107.78) with Microsoft SMTP Server id 14.2.342.4; Wed, 19 Feb 2014 05:59:28 -0500 Message-ID: <1392807567.23084.127.camel@kazak.uk.xensource.com> From: Ian Campbell To: Jan Beulich Date: Wed, 19 Feb 2014 10:59:27 +0000 In-Reply-To: <1392806237.23084.124.camel@kazak.uk.xensource.com> References: <53048136020000780011D8FF@nat28.tlf.novell.com> <1392806237.23084.124.camel@kazak.uk.xensource.com> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.4-3 MIME-Version: 1.0 X-Originating-IP: [10.80.2.80] X-DLP: MIA2 Cc: xen-devel , ian.jackson@eu.citrix.com Subject: [Xen-devel] [PATCH OSSTEST] Apply PYTHON_PREFIX_ARG workaround to Xen 4.2 and earlier(Was: Re: [xen-4.2-testing test] 25126: 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=neutral (google.com: 209.85.220.173 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: On Wed, 2014-02-19 at 10:37 +0000, Ian Campbell wrote: > I wonder if we need to apply: > http://wiki.xen.org/wiki/Compiling_Xen_From_Source#Python_Prefix_and_Module_Layout Like this, tested only the make-flight bit and ran perl -c on ts-xen-build to check syntax. 8<------------------- >From 58f45b8855c35297958fef0f0213878856f9b3bf Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 19 Feb 2014 10:54:54 +0000 Subject: [PATCH] Apply PYTHON_PREFIX_ARG workaround to Xen 4.2 and earlier ...rather than applying only if the host is Squeeze, since this also happens on Wheezy. Xen 4.3 onwards are not affected because they install to /usr/local instead of /usr which avoids this particular issue. The workaround is described in http://wiki.xen.org/wiki/Compiling_Xen_From_Source#Python_Prefix_and_Module_Layout We set PYTHON_PREFIX_ARG='' since that is what we did on Squeeze although that is a specific quirk of Ubuntu and we could use --install-layout=deb. Signed-off-by: Ian Campbell --- mfi-common | 14 ++++++++++++-- ts-xen-build | 4 ++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/mfi-common b/mfi-common index 8f56092..f443783 100644 --- a/mfi-common +++ b/mfi-common @@ -120,6 +120,16 @@ create_build_jobs () { *) enable_ovmf=true; esac + # http://wiki.xen.org/wiki/Compiling_Xen_From_Source#Python_Prefix_and_Module_Layout + # applies to Xen 4.2 and earlier. + case "$xenbranch" in + xen-3.*-testing) python_runvars=python_prefix_arg=;; + xen-4.0-testing) python_runvars=python_prefix_arg=;; + xen-4.1-testing) python_runvars=python_prefix_arg=;; + xen-4.2-testing) python_runvars=python_prefix_arg=;; + *) python_runvars=;; + esac + eval " arch_runvars=\"\$ARCH_RUNVARS_$arch\" " @@ -132,7 +142,7 @@ create_build_jobs () { tree_qemuu=$TREE_QEMU_UPSTREAM \ tree_xen=$TREE_XEN \ $RUNVARS $BUILD_RUNVARS $BUILD_XEN_RUNVARS $arch_runvars \ - $suite_runvars \ + $suite_runvars $python_runvars \ host_hostflags=$build_hostflags \ revision_xen=$REVISION_XEN \ revision_qemu=$REVISION_QEMU \ @@ -145,7 +155,7 @@ create_build_jobs () { tree_qemuu=$TREE_QEMU_UPSTREAM \ tree_xen=$TREE_XEN \ $RUNVARS $BUILD_RUNVARS $BUILD_XEN_RUNVARS $arch_runvars \ - $suite_runvars \ + $suite_runvars $python_runvars \ host_hostflags=$build_hostflags \ revision_xen=$REVISION_XEN \ revision_qemu=$REVISION_QEMU \ diff --git a/ts-xen-build b/ts-xen-build index 74d17f0..d228fb7 100755 --- a/ts-xen-build +++ b/ts-xen-build @@ -88,8 +88,8 @@ END (nonempty($r{revision_linux}) ? <>.config export $linux_rev_envvar='$r{revision_linux}' END - ($ho->{Suite} =~ m/squeeze/ ? <>.config PYTHON_PREFIX_ARG= + (defined($r{python_prefix_arg}) ? <>.config PYTHON_PREFIX_ARG=$r{python_prefix_arg} END (nonempty($kerns) ? <>.config KERNELS='$kerns'