Re: [Xen-devel] [PATCH] tools: disable xend build by default

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

On Thu, 2013-09-12 at 14:03 +0100, Ian Jackson wrote:
> Ian Campbell writes ("Re: [PATCH] tools: disable xend build by default"):
> > On Thu, 2013-09-12 at 11:34 +0100, Ian Campbell wrote:
> > 
> > This will need an osstest change:
> ...
> >      buildcmd_stamped_logged(300, 'configure', <<END,<<END,<<END);
> >              if test -f configure; then
> > +                if grep -q -- --enable-xend ; then
> > +                    enable_xend=--enable-xend
> > +                fi
> 
> Have you tested this ?  The grep seems to be missing the filename...

In a shell, from which I failed to cut-n-paste correctly... Sorry.

I also failed to quote $enable_xend correctly in the subsequent line :-(

The following has been tested as far as running configure both with and
without the relevant patch and is observed to pass the correct
arguments.

8<-----------------------------

From 3839f9fff0f313c4bb556daaa92f9b069b7bab3d Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@xxxxxxxxxx>
Date: Thu, 12 Sep 2013 11:33:40 +0100
Subject: [PATCH] ts-xen-build: enable xend at configure time if necessary

---
 ts-xen-build |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ts-xen-build b/ts-xen-build
index a600fe5..0304993 100755
--- a/ts-xen-build
+++ b/ts-xen-build
@@ -115,8 +115,11 @@ sub build () {
 END
     buildcmd_stamped_logged(300, 'configure', <<END,<<END,<<END);
             if test -f configure; then
+                if grep -q -- --enable-xend tools/configure ; then
+                    enable_xend=--enable-xend
+                fi
 END
-                ./configure --sysconfdir=/etc
+                ./configure --sysconfdir=/etc \$enable_xend
 END
             fi
 END
-- 
1.7.10.4




_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel