From patchwork Fri May 2 13:08:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 29541 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f200.google.com (mail-pd0-f200.google.com [209.85.192.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9A8B2202E7 for ; Fri, 2 May 2014 13:09:53 +0000 (UTC) Received: by mail-pd0-f200.google.com with SMTP id x10sf19408920pdj.11 for ; Fri, 02 May 2014 06:09:52 -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 :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=uaIqzZBZtwF6F2XCXoHAH+IcICNrTLjTbxXS0ktpUbQ=; b=Vt53o8G/hRpoIRsY+/e5dH7LDdkX1KWKLVH2u9Bie2/BaQ5yqKz/xwjO5kaDWqyVD7 N/hnV235GkuJtNgJ/WuqZ4q49WY6lKn/kwM4w01kiRkJhc+Cqflg85E4ZeClx7DVgRWO mI/sYU8A6oSJrl7VM/rEgJQyEh/FLSWEl+0ZI5WguOtp4i4q6GbbHnf/OmbbCuiksyRm b3Qgmulmau4gVr8TBU4iN9ireRKY8FsbrFPwB0V2z2Yx5O4Q74wNtr9WMutUpsq7bJ4R P/+eJgkorweMheywCVPs3M9UoCCS5bCx9IMSTnosIA8Uu4gV0sGH+wGtsASlY2AaZzst aitA== X-Gm-Message-State: ALoCoQnrsnbROyS8OlA/xhaoF7+hK3zWKVt96lDmemtMD17tjhH9ut0aFnpHmh4quhRzm593mg7h X-Received: by 10.66.252.198 with SMTP id zu6mr8667323pac.25.1399036192330; Fri, 02 May 2014 06:09:52 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.39.37 with SMTP id u34ls9030qgu.4.gmail; Fri, 02 May 2014 06:09:52 -0700 (PDT) X-Received: by 10.58.134.101 with SMTP id pj5mr131975veb.38.1399036192164; Fri, 02 May 2014 06:09:52 -0700 (PDT) Received: from mail-vc0-f182.google.com (mail-vc0-f182.google.com [209.85.220.182]) by mx.google.com with ESMTPS id a8si6694881vej.125.2014.05.02.06.09.52 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 02 May 2014 06:09:52 -0700 (PDT) Received-SPF: none (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) client-ip=209.85.220.182; Received: by mail-vc0-f182.google.com with SMTP id lf12so5419408vcb.13 for ; Fri, 02 May 2014 06:09:52 -0700 (PDT) X-Received: by 10.52.249.48 with SMTP id yr16mr97996vdc.62.1399036192078; Fri, 02 May 2014 06:09:52 -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.221.72 with SMTP id ib8csp101592vcb; Fri, 2 May 2014 06:09:51 -0700 (PDT) X-Received: by 10.52.2.229 with SMTP id 5mr11296538vdx.24.1399036191694; Fri, 02 May 2014 06:09:51 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id l2si6689082vcf.151.2014.05.02.06.09.51 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 02 May 2014 06:09:51 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) 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 1WgDCE-0005Wa-FN; Fri, 02 May 2014 13:08:10 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WgDCD-0005WE-8Y for xen-devel@lists.xen.org; Fri, 02 May 2014 13:08:09 +0000 Received: from [85.158.139.211:41813] by server-6.bemta-5.messagelabs.com id 36/38-19576-8B893635; Fri, 02 May 2014 13:08:08 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1399036086!1941797!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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19655 invoked from network); 2 May 2014 13:08:07 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-6.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 2 May 2014 13:08:07 -0000 X-IronPort-AV: E=Sophos;i="4.97,972,1389744000"; d="scan'208";a="127120517" Received: from accessns.citrite.net (HELO FTLPEX01CL03.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 02 May 2014 13:08:06 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.80) with Microsoft SMTP Server id 14.3.181.6; Fri, 2 May 2014 09:08:06 -0400 Received: from kazak.uk.xensource.com ([10.80.2.80] helo=zakaz.uk.xensource.com) by ukmail1.uk.xensource.com with smtp (Exim 4.69) (envelope-from ) id 1WgDC8-0000mo-Oq; Fri, 02 May 2014 14:08:05 +0100 Received: by zakaz.uk.xensource.com (sSMTP sendmail emulation); Fri, 02 May 2014 14:08:04 +0100 From: Ian Campbell To: Date: Fri, 2 May 2014 14:08:04 +0100 Message-ID: <1399036084-5356-1-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.9.0 MIME-Version: 1.0 X-DLP: MIA1 Cc: Ian Campbell , xen-devel@lists.xen.org Subject: [Xen-devel] [PATCH OSSTEST] libvirt: Fixes for older versions of Xen 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: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) 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: libvirt supports Xen 4.2 onwards. However: - We were not correctly setting the libvirtbuildjob runvar on 4.3 and earlier. - Xen 4.2 installs to /usr not /usr/local so the CFLAGS/LDFLAGS used to build libvirt were wrong. Signed-off-by: Ian Campbell --- mfi-common | 4 ++-- ts-libvirt-build | 13 +++++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/mfi-common b/mfi-common index 235575e..1663c96 100644 --- a/mfi-common +++ b/mfi-common @@ -211,13 +211,13 @@ job_create_test () { xen-3.*-testing:*) ;; xen-4.0-testing:*) ;; xen-4.1-testing:*) ;; + *:libvirt) tsbuildjob="libvirtbuildjob=$buildjob-libvirt" + ;; xen-4.2-testing:*) ;; xen-4.3-testing:*) ;; *:xend) xenbuildjob="$xenbuildjob-xend" buildjob="${bfi}build-$dom0arch-xend" ;; - *:libvirt) tsbuildjob="libvirtbuildjob=$buildjob-libvirt" - ;; esac ./cs-job-create $flight $job $recipe toolstack=$toolstack \ diff --git a/ts-libvirt-build b/ts-libvirt-build index 9c731ce..40e0692 100755 --- a/ts-libvirt-build +++ b/ts-libvirt-build @@ -48,12 +48,21 @@ sub checkout () { } sub config() { + my $xenprefix; + foreach (qw(/usr/local /usr)) { + if (target_file_exists($ho, "$xendist$_/lib/libxenctrl.so")) { + $xenprefix="$xendist$_"; + last; + } + } + die "no xen prefix" unless $xenprefix; + # Uses $GNULIB_SRCDIR because ./autogen.sh doesn't propagate # --gnulib-srcdir to ./bootstap. target_cmd_build($ho, 3600, $builddir, <