Re: [Xen-devel] [PATCH 2/9] tools/build: fix pygrub linking

[Roger Pau Monne <roger.pau@xxxxxxxxxx>]

Christoph Egger wrote:
> On 07/11/12 12:23, Roger Pau Monne wrote:
> 
>> Prevent creating a symlink to $(DESTDIR)/$(BINDIR) if it is the same
>> as $(PRIVATE_BINDIR)
>>
>> This fixes NetBSD install, where $(DESTDIR)/$(BINDIR) ==
>> $(PRIVATE_BINDIR).
>>
>> Cc: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
>> Cc: Christoph Egger <Christoph.Egger@xxxxxxx>
>> Signed-off-by: Roger Pau Monne <roger.pau@xxxxxxxxxx>
> 
> 
> Acked-by: Christoph Egger <Christoph.Egger@xxxxxxx>
> 
>> ---
>>  tools/pygrub/Makefile |    2 ++
>>  1 files changed, 2 insertions(+), 0 deletions(-)
>>
>> diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile
>> index bd22dd4..835fd43 100644
>> --- a/tools/pygrub/Makefile
>> +++ b/tools/pygrub/Makefile
>> @@ -14,7 +14,9 @@ install: all
>>              $(PYTHON_PREFIX_ARG) --root="$(DESTDIR)" \
>>              --install-scripts=$(PRIVATE_BINDIR) --force
>>      $(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
>> +#ifneq ($(readlink -f $(PRIVATE_BINDIR)), $(readlink -f 
>> $(DESTDIR)/$(BINDIR)))
>>      ln -sf $(PRIVATE_BINDIR)/pygrub $(DESTDIR)/$(BINDIR)
>> +#endif

I'm afraid I've not removed the "#" here (don't know why I've put them
on the first place), and also $(shell ...) should be used to get the
output. This is the correct path:

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

Subject: [PATCH] tools/build: fix pygrub linking

Prevent creating a symlink to $(DESTDIR)/$(BINDIR) if it is the same
as $(PRIVATE_BINDIR)

This fixes NetBSD install, where $(DESTDIR)/$(BINDIR) ==
$(PRIVATE_BINDIR).

Cc: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Cc: Christoph Egger <Christoph.Egger@xxxxxxx>
Signed-off-by: Roger Pau Monne <roger.pau@xxxxxxxxxx>
---
 tools/pygrub/Makefile |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile
index bd22dd4..182afdd 100644
--- a/tools/pygrub/Makefile
+++ b/tools/pygrub/Makefile
@@ -14,7 +14,9 @@ install: all
                $(PYTHON_PREFIX_ARG) --root="$(DESTDIR)" \
                --install-scripts=$(PRIVATE_BINDIR) --force
        $(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
+ifneq ($(shell readlink -f $(DESTDIR)/$(BINDIR)), $(shell readlink -f
$(PRIVATE_BINDIR)))
        ln -sf $(PRIVATE_BINDIR)/pygrub $(DESTDIR)/$(BINDIR)
+endif

 .PHONY: clean
 clean:
-- 
1.7.7.5 (Apple Git-26)

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