From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ian Campbell <Ian.Campbell@citrix.com>
Subject: Re: [PATCH v2 1/5] tools/build: fix pygrub linking
Date: Thu, 2 Aug 2012 07:44:11 +0100
Message-ID: <1343889851.7571.21.camel@dagon.hellion.org.uk>
References: <1343332476-33765-1-git-send-email-roger.pau@citrix.com>
	<1343332476-33765-2-git-send-email-roger.pau@citrix.com>
	<1343378909.6812.86.camel@zakaz.uk.xensource.com>
	<1343821660.27221.82.camel@zakaz.uk.xensource.com>
	<20120802054214.GA13335@aepfle.de>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
In-Reply-To: <20120802054214.GA13335@aepfle.de>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: Olaf Hering <olaf@aepfle.de>
Cc: Christoph Egger <Christoph.Egger@amd.com>, "xen-devel@lists.xen.org" <xen-devel@lists.xen.org>, Ian Jackson <Ian.Jackson@eu.citrix.com>, Roger Pau Monne <roger.pau@citrix.com>
List-Id: xen-devel@lists.xenproject.org

On Thu, 2012-08-02 at 06:42 +0100, Olaf Hering wrote:
> On Wed, Aug 01, Ian Campbell wrote:
> 
> > > > diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile
> > > > index bd22dd4..8c99e11 100644
> > > > --- a/tools/pygrub/Makefile
> > > > +++ b/tools/pygrub/Makefile
> > > > @@ -14,7 +14,10 @@ install: all
> > > >  		$(PYTHON_PREFIX_ARG) --root="$(DESTDIR)" \
> > > >  		--install-scripts=$(PRIVATE_BINDIR) --force
> > > >  	$(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
> > > > -	ln -sf $(PRIVATE_BINDIR)/pygrub $(DESTDIR)/$(BINDIR)
> > > > +	set -e; if [ `readlink -f $(DESTDIR)/$(BINDIR)` != \
> > > > +	             `readlink -f $(PRIVATE_BINDIR)` ]; then \
> > > > +	    ln -sf $(PRIVATE_BINDIR)/pygrub $(DESTDIR)/$(BINDIR); \
> > > > +	fi
> 
> This needs quoting for the shell, like shown below:

Right, thanks.

Can you provide a S-o-b and I'll fabricate up a changelog as I commit
it.

> 
> [  148s] set -e; if [ `readlink -f /home/abuild/rpmbuild/BUILD/xen-4.2.25700/non-dbg/dist/install//usr/bin` != \
> [  148s]              `readlink -f /usr/lib64/xen/bin` ]; then \
> [  148s]     ln -sf /usr/lib64/xen/bin/pygrub /home/abuild/rpmbuild/BUILD/xen-4.2.25700/non-dbg/dist/install//usr/bin; \
> [  148s] fi
> [  148s] /bin/sh: line 0: [: /home/abuild/rpmbuild/BUILD/xen-4.2.25700/non-dbg/dist/install/usr/bin: unary operator expected
> 
> diff -r 3d622e2c7cfb tools/pygrub/Makefile
> --- a/tools/pygrub/Makefile
> +++ b/tools/pygrub/Makefile
> @@ -14,8 +14,8 @@ install: all
>  		$(PYTHON_PREFIX_ARG) --root="$(DESTDIR)" \
>  		--install-scripts=$(PRIVATE_BINDIR) --force
>  	$(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
> -	set -e; if [ `readlink -f $(DESTDIR)/$(BINDIR)` != \
> -	             `readlink -f $(PRIVATE_BINDIR)` ]; then \
> +	set -e; if [ "`readlink -f $(DESTDIR)/$(BINDIR)`" != \
> +	             "`readlink -f $(PRIVATE_BINDIR)`" ]; then \
>  	    ln -sf $(PRIVATE_BINDIR)/pygrub $(DESTDIR)/$(BINDIR); \
>  	fi
>  
> Olaf