From: Olaf Hering <olaf@aepfle.de>
To: Ian Campbell <Ian.Campbell@citrix.com>
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>
Subject: Re: [PATCH v2 1/5] tools/build: fix pygrub linking
Date: Thu, 2 Aug 2012 07:42:14 +0200 [thread overview]
Message-ID: <20120802054214.GA13335@aepfle.de> (raw)
In-Reply-To: <1343821660.27221.82.camel@zakaz.uk.xensource.com>
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:
[ 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
next prev parent reply other threads:[~2012-08-02 5:42 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-26 19:54 [PATCH v2 0/5] NetBSD: minor fixes and hotplug execution Roger Pau Monne
2012-07-26 19:54 ` [PATCH v2 1/5] tools/build: fix pygrub linking Roger Pau Monne
2012-07-27 8:48 ` Ian Campbell
2012-08-01 11:47 ` Ian Campbell
2012-08-02 5:42 ` Olaf Hering [this message]
2012-08-02 6:44 ` Ian Campbell
2012-07-26 19:54 ` [PATCH v2 2/5] libxl: react correctly to POLLHUP Roger Pau Monne
2012-07-27 8:53 ` Ian Campbell
2012-07-27 14:26 ` Ian Jackson
2012-07-27 17:01 ` Ian Jackson
2012-07-31 13:18 ` Ian Campbell
2012-07-31 14:42 ` Ian Jackson
2012-07-27 14:27 ` Ian Jackson
2012-07-26 19:54 ` [PATCH v2 3/5] hotplug/NetBSD: check type of file to attach from params Roger Pau Monne
2012-07-27 14:28 ` Ian Jackson
2012-07-26 19:54 ` [PATCH v2 4/5] libxl: call hotplug scripts from xl for NetBSD Roger Pau Monne
2012-07-27 12:49 ` Christoph Egger
2012-08-01 11:47 ` Ian Campbell
2012-07-26 19:54 ` [PATCH v2 5/5] init/NetBSD: move xenbackendd to xend init script Roger Pau Monne
2012-07-27 12:50 ` Christoph Egger
2012-07-27 14:29 ` Ian Jackson
2012-07-27 14:49 ` Christoph Egger
2012-08-01 11:47 ` Ian Campbell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120802054214.GA13335@aepfle.de \
--to=olaf@aepfle.de \
--cc=Christoph.Egger@amd.com \
--cc=Ian.Campbell@citrix.com \
--cc=Ian.Jackson@eu.citrix.com \
--cc=roger.pau@citrix.com \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.