[PATCH] Fix pygrub install.

[PATCH] Fix pygrub install.

[Anthony PERARD]

The script pygrub is currently installed in the wrong location. Instead of
/usr/lib/xen/bin, the script is installed in $destdir/usr/lib/xen/bin.
$(DESTDIR) is apply twice.

Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
---
 tools/pygrub/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile
index f8c5262..af2b8a5 100644
--- a/tools/pygrub/Makefile
+++ b/tools/pygrub/Makefile
@@ -12,7 +12,7 @@ build:
 install: all
 	CC="$(CC)" CFLAGS="$(CFLAGS)" $(PYTHON) setup.py install \
 		$(PYTHON_PREFIX_ARG) --root="$(DESTDIR)" \
-		--install-scripts=$(DESTDIR)/$(PRIVATE_BINDIR) --force
+		--install-scripts=$(PRIVATE_BINDIR) --force
 	$(INSTALL_PYTHON_PROG) src/pygrub $(DESTDIR)/$(PRIVATE_BINDIR)/pygrub
 	$(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
 	ln -sf $(PRIVATE_BINDIR)/pygrub $(DESTDIR)/$(BINDIR)
-- 
Anthony PERARD

Re: [PATCH] Fix pygrub install.

[George Dunlap]

On Wed, May 30, 2012 at 5:56 PM, Anthony PERARD
<anthony.perard@citrix.com> wrote:
> The script pygrub is currently installed in the wrong location. Instead of
> /usr/lib/xen/bin, the script is installed in $destdir/usr/lib/xen/bin.
> $(DESTDIR) is apply twice.

$(DESTDIR) isn't the intended final path (i.e., /usr/lib/xen/bin);
it's the subdirectory where you want "make dist" to put the files from
this make -- normally in xen-unstable.hg/dist/install/.  This change
will make it so that simply doing "make tools" (which is expected to
compile things and put the output in xen.hg/dist/install) will change
the *currently installed* version of pygrub.

 -George

>
> Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
> ---
>  tools/pygrub/Makefile |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile
> index f8c5262..af2b8a5 100644
> --- a/tools/pygrub/Makefile
> +++ b/tools/pygrub/Makefile
> @@ -12,7 +12,7 @@ build:
>  install: all
>        CC="$(CC)" CFLAGS="$(CFLAGS)" $(PYTHON) setup.py install \
>                $(PYTHON_PREFIX_ARG) --root="$(DESTDIR)" \
> -               --install-scripts=$(DESTDIR)/$(PRIVATE_BINDIR) --force
> +               --install-scripts=$(PRIVATE_BINDIR) --force
>        $(INSTALL_PYTHON_PROG) src/pygrub $(DESTDIR)/$(PRIVATE_BINDIR)/pygrub
>        $(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
>        ln -sf $(PRIVATE_BINDIR)/pygrub $(DESTDIR)/$(BINDIR)
> --
> Anthony PERARD
>
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel

Re: [PATCH] Fix pygrub install.

[George Dunlap]

On Wed, May 30, 2012 at 5:56 PM, Anthony PERARD
<anthony.perard@citrix.com> wrote:
> The script pygrub is currently installed in the wrong location. Instead of
> /usr/lib/xen/bin, the script is installed in $destdir/usr/lib/xen/bin.
> $(DESTDIR) is apply twice.
>
> Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>

Hmm -- I'm sure I checked this... but you're right, $(DESTDIR) IS IN
THE --root command.

The strange thing is that there *is* a pygrub in the right place, so
it appears that thefollowing line ($INSTALL_PYTHON_PROG) is redundant?

Anyway:

Acked-by: George Dunlap <george.dunlap@eu.citrix.com>

> ---
>  tools/pygrub/Makefile |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile
> index f8c5262..af2b8a5 100644
> --- a/tools/pygrub/Makefile
> +++ b/tools/pygrub/Makefile
> @@ -12,7 +12,7 @@ build:
>  install: all
>        CC="$(CC)" CFLAGS="$(CFLAGS)" $(PYTHON) setup.py install \
>                $(PYTHON_PREFIX_ARG) --root="$(DESTDIR)" \
> -               --install-scripts=$(DESTDIR)/$(PRIVATE_BINDIR) --force
> +               --install-scripts=$(PRIVATE_BINDIR) --force
>        $(INSTALL_PYTHON_PROG) src/pygrub $(DESTDIR)/$(PRIVATE_BINDIR)/pygrub
>        $(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
>        ln -sf $(PRIVATE_BINDIR)/pygrub $(DESTDIR)/$(BINDIR)
> --
> Anthony PERARD
>
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel

Re: [PATCH] Fix pygrub install.

[Anthony PERARD]

On Thu, May 31, 2012 at 10:42 AM, George Dunlap
<George.Dunlap@eu.citrix.com> wrote:
> The strange thing is that there *is* a pygrub in the right place, so
> it appears that thefollowing line ($INSTALL_PYTHON_PROG) is redundant?

It's seems that the right on the script are already set to 755 by the
setup.py, so this $INSTALL_PYTHON_PROG line is probably an extra.

Thanks,

-- 
Anthony PERARD

Re: [PATCH] Fix pygrub install.

[Ian Campbell]

On Thu, 2012-05-31 at 10:54 +0100, Anthony PERARD wrote:
> On Thu, May 31, 2012 at 10:42 AM, George Dunlap
> <George.Dunlap@eu.citrix.com> wrote:
> > The strange thing is that there *is* a pygrub in the right place, so
> > it appears that thefollowing line ($INSTALL_PYTHON_PROG) is redundant?
> 
> It's seems that the right on the script are already set to 755 by the
> setup.py, so this $INSTALL_PYTHON_PROG line is probably an extra.

What is the conclusion here? Is the original patch correct and/or is
there a subsequent additional fix?

My scripts does things like:
        make -C tools XEN_TARGET_ARCH=x86_32 DESTDIR=/tmp/tmp0_hnbt LIBXL_TESTIDL_SEED=42 debug=y -j12 install
then tars up /tmp/tmp0_hnbt, copies it to my test box and untars. I've
just noticed on my test box:
        # ls -dl /tmp/tmp* 
        drwxr-xr-x 3 root root 4096 Jun  1 09:26 /tmp/tmp0_hnbt
        drwxr-xr-x 3 root root 4096 May 18 11:11 /tmp/tmp8D2Mvc
        drwxr-xr-x 3 root root 4096 May 25 10:21 /tmp/tmpAd2OFq
        drwxr-xr-x 3 root root 4096 May 18 15:05 /tmp/tmpEqYZpf
        [...]
        # find /tmp/tmp* -name pygrub | wc -l 
        19
        
Oops!

Ian.

Re: [PATCH] Fix pygrub install.

[George Dunlap]

On 01/06/12 09:29, Ian Campbell wrote:
> On Thu, 2012-05-31 at 10:54 +0100, Anthony PERARD wrote:
>> On Thu, May 31, 2012 at 10:42 AM, George Dunlap
>> <George.Dunlap@eu.citrix.com>  wrote:
>>> The strange thing is that there *is* a pygrub in the right place, so
>>> it appears that thefollowing line ($INSTALL_PYTHON_PROG) is redundant?
>> It's seems that the right on the script are already set to 755 by the
>> setup.py, so this $INSTALL_PYTHON_PROG line is probably an extra.
> What is the conclusion here? Is the original patch correct and/or is
> there a subsequent additional fix?
There is a bug (pygrub is installed both in $(DESTDIR)/foo and 
$(DESTDIR)/$(DESTDIR)/foo), and Anthony's first patch (AFAICT) correctly 
fixes the bug (only installed in $(DESTDIR).

I think there is a redundant command in the Makefile as well, where 
pygrub will be copied to $(DESTDIR)/foo twice.  That doesn't cause 
incorrect behavior, but I would probably still consider it a bug.

So the original patch is correct, but there is a subsequent fix.
> My scripts does things like:
>          make -C tools XEN_TARGET_ARCH=x86_32 DESTDIR=/tmp/tmp0_hnbt LIBXL_TESTIDL_SEED=42 debug=y -j12 install
> then tars up /tmp/tmp0_hnbt, copies it to my test box and untars. I've
> just noticed on my test box:
>          # ls -dl /tmp/tmp*
>          drwxr-xr-x 3 root root 4096 Jun  1 09:26 /tmp/tmp0_hnbt
>          drwxr-xr-x 3 root root 4096 May 18 11:11 /tmp/tmp8D2Mvc
>          drwxr-xr-x 3 root root 4096 May 25 10:21 /tmp/tmpAd2OFq
>          drwxr-xr-x 3 root root 4096 May 18 15:05 /tmp/tmpEqYZpf
>          [...]
>          # find /tmp/tmp* -name pygrub | wc -l
>          19
The "right thing" is to find find 2 files named "pygrub" per directory 
(a binary at /usr/lib/xen/bin/pygrub and a link to that binary at 
/usr/bin/pygrub, for compatibility).  Without Anthony's patch you would 
get 3.  Not sure how that corresponds to the directories you have there...

  -George

Re: [PATCH] Fix pygrub install.

[Ian Campbell]

On Fri, 2012-06-01 at 11:11 +0100, George Dunlap wrote:
> On 01/06/12 09:29, Ian Campbell wrote:
> > On Thu, 2012-05-31 at 10:54 +0100, Anthony PERARD wrote:
> >> On Thu, May 31, 2012 at 10:42 AM, George Dunlap
> >> <George.Dunlap@eu.citrix.com>  wrote:
> >>> The strange thing is that there *is* a pygrub in the right place, so
> >>> it appears that thefollowing line ($INSTALL_PYTHON_PROG) is redundant?
> >> It's seems that the right on the script are already set to 755 by the
> >> setup.py, so this $INSTALL_PYTHON_PROG line is probably an extra.
> > What is the conclusion here? Is the original patch correct and/or is
> > there a subsequent additional fix?
> There is a bug (pygrub is installed both in $(DESTDIR)/foo and 
> $(DESTDIR)/$(DESTDIR)/foo), and Anthony's first patch (AFAICT) correctly 
> fixes the bug (only installed in $(DESTDIR).
> 
> I think there is a redundant command in the Makefile as well, where 
> pygrub will be copied to $(DESTDIR)/foo twice.  That doesn't cause 
> incorrect behavior, but I would probably still consider it a bug.
> 
> So the original patch is correct, but there is a subsequent fix.
> > My scripts does things like:
> >          make -C tools XEN_TARGET_ARCH=x86_32 DESTDIR=/tmp/tmp0_hnbt LIBXL_TESTIDL_SEED=42 debug=y -j12 install
> > then tars up /tmp/tmp0_hnbt, copies it to my test box and untars. I've
> > just noticed on my test box:
> >          # ls -dl /tmp/tmp*
> >          drwxr-xr-x 3 root root 4096 Jun  1 09:26 /tmp/tmp0_hnbt
> >          drwxr-xr-x 3 root root 4096 May 18 11:11 /tmp/tmp8D2Mvc
> >          drwxr-xr-x 3 root root 4096 May 25 10:21 /tmp/tmpAd2OFq
> >          drwxr-xr-x 3 root root 4096 May 18 15:05 /tmp/tmpEqYZpf
> >          [...]
> >          # find /tmp/tmp* -name pygrub | wc -l
> >          19
> The "right thing" is to find find 2 files named "pygrub" per directory 
> (a binary at /usr/lib/xen/bin/pygrub and a link to that binary at 
> /usr/bin/pygrub, for compatibility).  Without Anthony's patch you would 
> get 3.  Not sure how that corresponds to the directories you have there...

This is the actual installed files on my test machine, not my build
machine. 

On my build system I would have had:
 /tmp/tmpEqYZpf/usr/lib/xen/bin/pygrub
 /tmp/tmpEqYZpf/usr/bin/pygrub -> /usr/lib/xen/bin/pygrub
 /tmp/tmpEqYZpf/tmp/tmpEqYZpf/usr/lib/xen/bin/pygrub

I then "tar -C /tmp/tmpEqYZpf  cf blah.tar ." and copy+untar blah.tar on
the so that on the target I get:
 /usr/lib/xen/bin/pygrub
 /usr/bin/pygrub -> /usr/lib/xen/bin/pygrub
 /tmp/tmpEqYZpf/usr/lib/xen/bin/pygrub

Where the last is what I find above via find etc.

Ian.

Re: [PATCH] Fix pygrub install.

[Roger Pau Monne]

George Dunlap wrote:
> On 01/06/12 09:29, Ian Campbell wrote:
>> On Thu, 2012-05-31 at 10:54 +0100, Anthony PERARD wrote:
>>> On Thu, May 31, 2012 at 10:42 AM, George Dunlap
>>> <George.Dunlap@eu.citrix.com>   wrote:
>>>> The strange thing is that there *is* a pygrub in the right place, so
>>>> it appears that thefollowing line ($INSTALL_PYTHON_PROG) is redundant?
>>> It's seems that the right on the script are already set to 755 by the
>>> setup.py, so this $INSTALL_PYTHON_PROG line is probably an extra.
>> What is the conclusion here? Is the original patch correct and/or is
>> there a subsequent additional fix?
> There is a bug (pygrub is installed both in $(DESTDIR)/foo and
> $(DESTDIR)/$(DESTDIR)/foo), and Anthony's first patch (AFAICT) correctly
> fixes the bug (only installed in $(DESTDIR).
>
> I think there is a redundant command in the Makefile as well, where
> pygrub will be copied to $(DESTDIR)/foo twice.  That doesn't cause
> incorrect behavior, but I would probably still consider it a bug.

I get an error when performing an install-tools on NetBSD:

byte-compiling /usr/xen42/lib/python2.7/site-packages/grub/LiloConf.py 
to LiloConf.pyc
running install_scripts
copying build/scripts-2.7/pygrub -> //usr/xen42/bin
error: //usr/xen42/bin/pygrub: Too many levels of symbolic links
gmake[3]: *** [install] Error 1
gmake[3]: Leaving directory `/root/xen/xen-clean/tools/pygrub'
gmake[2]: *** [subdir-install-pygrub] Error 2
gmake[2]: Leaving directory `/root/xen/xen-clean/tools'
gmake[1]: *** [subdirs-install] Error 2
gmake[1]: Leaving directory `/root/xen/xen-clean/tools'
gmake: *** [install-tools] Error 2

Which I'm quite sure is caused by this.

Re: [PATCH] Fix pygrub install.

[Ian Campbell]

On Fri, 2012-06-01 at 11:21 +0100, Roger Pau Monne wrote:
> George Dunlap wrote:
> > On 01/06/12 09:29, Ian Campbell wrote:
> >> On Thu, 2012-05-31 at 10:54 +0100, Anthony PERARD wrote:
> >>> On Thu, May 31, 2012 at 10:42 AM, George Dunlap
> >>> <George.Dunlap@eu.citrix.com>   wrote:
> >>>> The strange thing is that there *is* a pygrub in the right place, so
> >>>> it appears that thefollowing line ($INSTALL_PYTHON_PROG) is redundant?
> >>> It's seems that the right on the script are already set to 755 by the
> >>> setup.py, so this $INSTALL_PYTHON_PROG line is probably an extra.
> >> What is the conclusion here? Is the original patch correct and/or is
> >> there a subsequent additional fix?
> > There is a bug (pygrub is installed both in $(DESTDIR)/foo and
> > $(DESTDIR)/$(DESTDIR)/foo), and Anthony's first patch (AFAICT) correctly
> > fixes the bug (only installed in $(DESTDIR).
> >
> > I think there is a redundant command in the Makefile as well, where
> > pygrub will be copied to $(DESTDIR)/foo twice.  That doesn't cause
> > incorrect behavior, but I would probably still consider it a bug.
> 
> I get an error when performing an install-tools on NetBSD:
> 
> byte-compiling /usr/xen42/lib/python2.7/site-packages/grub/LiloConf.py 
> to LiloConf.pyc
> running install_scripts
> copying build/scripts-2.7/pygrub -> //usr/xen42/bin
> error: //usr/xen42/bin/pygrub: Too many levels of symbolic links

OOI what does //usr/xen42/bin/pygrub point to?

> gmake[3]: *** [install] Error 1
> gmake[3]: Leaving directory `/root/xen/xen-clean/tools/pygrub'
> gmake[2]: *** [subdir-install-pygrub] Error 2
> gmake[2]: Leaving directory `/root/xen/xen-clean/tools'
> gmake[1]: *** [subdirs-install] Error 2
> gmake[1]: Leaving directory `/root/xen/xen-clean/tools'
> gmake: *** [install-tools] Error 2
> 
> Which I'm quite sure is caused by this.

"this" == this problem or "this" == this patch?

Re: [PATCH] Fix pygrub install.

[Roger Pau Monne]

Ian Campbell wrote:
> On Fri, 2012-06-01 at 11:21 +0100, Roger Pau Monne wrote:
>> George Dunlap wrote:
>>> On 01/06/12 09:29, Ian Campbell wrote:
>>>> On Thu, 2012-05-31 at 10:54 +0100, Anthony PERARD wrote:
>>>>> On Thu, May 31, 2012 at 10:42 AM, George Dunlap
>>>>> <George.Dunlap@eu.citrix.com>    wrote:
>>>>>> The strange thing is that there *is* a pygrub in the right place, so
>>>>>> it appears that thefollowing line ($INSTALL_PYTHON_PROG) is redundant?
>>>>> It's seems that the right on the script are already set to 755 by the
>>>>> setup.py, so this $INSTALL_PYTHON_PROG line is probably an extra.
>>>> What is the conclusion here? Is the original patch correct and/or is
>>>> there a subsequent additional fix?
>>> There is a bug (pygrub is installed both in $(DESTDIR)/foo and
>>> $(DESTDIR)/$(DESTDIR)/foo), and Anthony's first patch (AFAICT) correctly
>>> fixes the bug (only installed in $(DESTDIR).
>>>
>>> I think there is a redundant command in the Makefile as well, where
>>> pygrub will be copied to $(DESTDIR)/foo twice.  That doesn't cause
>>> incorrect behavior, but I would probably still consider it a bug.
>> I get an error when performing an install-tools on NetBSD:
>>
>> byte-compiling /usr/xen42/lib/python2.7/site-packages/grub/LiloConf.py
>> to LiloConf.pyc
>> running install_scripts
>> copying build/scripts-2.7/pygrub ->  //usr/xen42/bin
>> error: //usr/xen42/bin/pygrub: Too many levels of symbolic links
>
> OOI what does //usr/xen42/bin/pygrub point to?

lrwxr-xr-x  1 root  wheel  21 May 25 14:32 //usr/xen42/bin/pygrub -> 
/usr/xen42/bin/pygrub

>> gmake[3]: *** [install] Error 1
>> gmake[3]: Leaving directory `/root/xen/xen-clean/tools/pygrub'
>> gmake[2]: *** [subdir-install-pygrub] Error 2
>> gmake[2]: Leaving directory `/root/xen/xen-clean/tools'
>> gmake[1]: *** [subdirs-install] Error 2
>> gmake[1]: Leaving directory `/root/xen/xen-clean/tools'
>> gmake: *** [install-tools] Error 2
>>
>> Which I'm quite sure is caused by this.
>
> "this" == this problem or "this" == this patch?

I haven't tried the patch, I was referring to the current code in the 
repository, so this == this problem.

Re: [PATCH] Fix pygrub install.

[George Dunlap]

On 01/06/12 11:35, Roger Pau Monne wrote:
> Ian Campbell wrote:
>> On Fri, 2012-06-01 at 11:21 +0100, Roger Pau Monne wrote:
>>> George Dunlap wrote:
>>>> On 01/06/12 09:29, Ian Campbell wrote:
>>>>> On Thu, 2012-05-31 at 10:54 +0100, Anthony PERARD wrote:
>>>>>> On Thu, May 31, 2012 at 10:42 AM, George Dunlap
>>>>>> <George.Dunlap@eu.citrix.com>     wrote:
>>>>>>> The strange thing is that there *is* a pygrub in the right place, so
>>>>>>> it appears that thefollowing line ($INSTALL_PYTHON_PROG) is redundant?
>>>>>> It's seems that the right on the script are already set to 755 by the
>>>>>> setup.py, so this $INSTALL_PYTHON_PROG line is probably an extra.
>>>>> What is the conclusion here? Is the original patch correct and/or is
>>>>> there a subsequent additional fix?
>>>> There is a bug (pygrub is installed both in $(DESTDIR)/foo and
>>>> $(DESTDIR)/$(DESTDIR)/foo), and Anthony's first patch (AFAICT) correctly
>>>> fixes the bug (only installed in $(DESTDIR).
>>>>
>>>> I think there is a redundant command in the Makefile as well, where
>>>> pygrub will be copied to $(DESTDIR)/foo twice.  That doesn't cause
>>>> incorrect behavior, but I would probably still consider it a bug.
>>> I get an error when performing an install-tools on NetBSD:
>>>
>>> byte-compiling /usr/xen42/lib/python2.7/site-packages/grub/LiloConf.py
>>> to LiloConf.pyc
>>> running install_scripts
>>> copying build/scripts-2.7/pygrub ->   //usr/xen42/bin
>>> error: //usr/xen42/bin/pygrub: Too many levels of symbolic links
>> OOI what does //usr/xen42/bin/pygrub point to?
> lrwxr-xr-x  1 root  wheel  21 May 25 14:32 //usr/xen42/bin/pygrub ->
> /usr/xen42/bin/pygrub
>
>>> gmake[3]: *** [install] Error 1
>>> gmake[3]: Leaving directory `/root/xen/xen-clean/tools/pygrub'
>>> gmake[2]: *** [subdir-install-pygrub] Error 2
>>> gmake[2]: Leaving directory `/root/xen/xen-clean/tools'
>>> gmake[1]: *** [subdirs-install] Error 2
>>> gmake[1]: Leaving directory `/root/xen/xen-clean/tools'
>>> gmake: *** [install-tools] Error 2
>>>
>>> Which I'm quite sure is caused by this.
>> "this" == this problem or "this" == this patch?
> I haven't tried the patch, I was referring to the current code in the
> repository, so this == this problem.
Ah, but that must be a different problem -- is it perhaps the case that 
in NetBSD $(PRIVATE_BINDIR) and $(BINDIR) are the same?

  -George

Re: [PATCH] Fix pygrub install.

[Anthony PERARD]

On 01/06/12 11:11, George Dunlap wrote:
> On 01/06/12 09:29, Ian Campbell wrote:
>> >  On Thu, 2012-05-31 at 10:54 +0100, Anthony PERARD wrote:
>>> >>  On Thu, May 31, 2012 at 10:42 AM, George Dunlap
>>> >>  <George.Dunlap@eu.citrix.com>   wrote:
>>>> >>>  The strange thing is that there*is*  a pygrub in the right place, so
>>>> >>>  it appears that thefollowing line ($INSTALL_PYTHON_PROG) is redundant?
>>> >>  It's seems that the right on the script are already set to 755 by the
>>> >>  setup.py, so this $INSTALL_PYTHON_PROG line is probably an extra.
>> >  What is the conclusion here? Is the original patch correct and/or is
>> >  there a subsequent additional fix?
> There is a bug (pygrub is installed both in $(DESTDIR)/foo and
> $(DESTDIR)/$(DESTDIR)/foo), and Anthony's first patch (AFAICT) correctly
> fixes the bug (only installed in $(DESTDIR).
>
> I think there is a redundant command in the Makefile as well, where
> pygrub will be copied to $(DESTDIR)/foo twice.  That doesn't cause
> incorrect behavior, but I would probably still consider it a bug.
>
> So the original patch is correct, but there is a subsequent fix.

I'll send a patch that remove this extra line as the pygrub script is 
copied by setup.py.

-- 
Anthony PERARD

Re: [PATCH] Fix pygrub install.

[George Dunlap]

Ian, ping?  I think Anthony's original patch (as well as his
follow-up) should both be applied.

 -George

On Fri, Jun 1, 2012 at 12:14 PM, Anthony PERARD
<anthony.perard@citrix.com> wrote:
> On 01/06/12 11:11, George Dunlap wrote:
>>
>> On 01/06/12 09:29, Ian Campbell wrote:
>>>
>>> >  On Thu, 2012-05-31 at 10:54 +0100, Anthony PERARD wrote:
>>>>
>>>> >>  On Thu, May 31, 2012 at 10:42 AM, George Dunlap
>>>> >>  <George.Dunlap@eu.citrix.com>   wrote:
>>>>>
>>>>> >>>  The strange thing is that there*is*  a pygrub in the right place,
>>>>> >>> so
>>>>>
>>>>> >>>  it appears that thefollowing line ($INSTALL_PYTHON_PROG) is
>>>>> >>> redundant?
>>>>
>>>> >>  It's seems that the right on the script are already set to 755 by
>>>> >> the
>>>> >>  setup.py, so this $INSTALL_PYTHON_PROG line is probably an extra.
>>>
>>> >  What is the conclusion here? Is the original patch correct and/or is
>>> >  there a subsequent additional fix?
>>
>> There is a bug (pygrub is installed both in $(DESTDIR)/foo and
>> $(DESTDIR)/$(DESTDIR)/foo), and Anthony's first patch (AFAICT) correctly
>> fixes the bug (only installed in $(DESTDIR).
>>
>> I think there is a redundant command in the Makefile as well, where
>> pygrub will be copied to $(DESTDIR)/foo twice.  That doesn't cause
>> incorrect behavior, but I would probably still consider it a bug.
>>
>> So the original patch is correct, but there is a subsequent fix.
>
>
> I'll send a patch that remove this extra line as the pygrub script is copied
> by setup.py.
>
> --
> Anthony PERARD
>
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel