[PATCH] tools: use PREFIX when building upstream qemu

[PATCH] tools: use PREFIX when building upstream qemu

[Christoph Egger]

[-- Attachment #1: Type: text/plain, Size: 350 bytes --]


use PREFIX when building upstream qemu.

Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>

-- 
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Einsteinring 24, 85689 Dornach b. Muenchen
Geschaeftsfuehrer: Alberto Bozzo
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632

[-- Attachment #2: xen_qemu_prefix.diff --]
[-- Type: text/plain, Size: 379 bytes --]

diff -r 3d327e56bff2 -r 6b73078a4403 tools/Makefile
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -190,6 +190,7 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-fi
 	fi; \
 	cd qemu-xen-dir; \
 	$$source/configure --enable-xen --target-list=i386-softmmu \
+		--prefix=$(PREFIX) \
 		--source-path=$$source \
 		--extra-cflags="-I$(XEN_ROOT)/tools/include \
 		-I$(XEN_ROOT)/tools/libxc \

[-- Attachment #3: Type: text/plain, Size: 126 bytes --]

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

Re: [PATCH] tools: use PREFIX when building upstream qemu

[Ian Jackson]

Christoph Egger writes ("[Xen-devel] [PATCH] tools: use PREFIX when building upstream qemu"):
> 
> use PREFIX when building upstream qemu.
> 
> Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>

This looks reasonable but can you explain what goes wrong when,
without this ?  I'd like to be able to verify the bug and fix myself.

Ian.

Re: [PATCH] tools: use PREFIX when building upstream qemu

[Christoph Egger]

On 10/25/12 14:39, Ian Jackson wrote:
> Christoph Egger writes ("[Xen-devel] [PATCH] tools: use PREFIX when building upstream qemu"):
>>
>> use PREFIX when building upstream qemu.
>>
>> Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
> 
> This looks reasonable but can you explain what goes wrong when,
> without this ?  I'd like to be able to verify the bug and fix myself.

qemu's configure assumes /usr/local as prefix by default, otherwise.
With this patch, qemu config files and manpages are installed under
the specified $(PREFIX).

Christoph


-- 
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Einsteinring 24, 85689 Dornach b. Muenchen
Geschaeftsfuehrer: Alberto Bozzo
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632

Re: [PATCH] tools: use PREFIX when building upstream qemu

[Ian Campbell]

On Fri, 2012-10-26 at 10:47 +0100, Christoph Egger wrote:
> On 10/25/12 14:39, Ian Jackson wrote:
> > Christoph Egger writes ("[Xen-devel] [PATCH] tools: use PREFIX when building upstream qemu"):
> >>
> >> use PREFIX when building upstream qemu.
> >>
> >> Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
> > 
> > This looks reasonable but can you explain what goes wrong when,
> > without this ?  I'd like to be able to verify the bug and fix myself.
> 
> qemu's configure assumes /usr/local as prefix by default, otherwise.
> With this patch, qemu config files and manpages are installed under
> the specified $(PREFIX).

Is that what we want? Or do we want our version of qemu to be
under /usr/lib/xen?

> 
> Christoph
> 
> 

Re: [PATCH] tools: use PREFIX when building upstream qemu

[Christoph Egger]

On 10/26/12 12:15, Ian Campbell wrote:
> On Fri, 2012-10-26 at 10:47 +0100, Christoph Egger wrote:
>> On 10/25/12 14:39, Ian Jackson wrote:
>>> Christoph Egger writes ("[Xen-devel] [PATCH] tools: use PREFIX when building upstream qemu"):
>>>>
>>>> use PREFIX when building upstream qemu.
>>>>
>>>> Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
>>>
>>> This looks reasonable but can you explain what goes wrong when,
>>> without this ?  I'd like to be able to verify the bug and fix myself.
>>
>> qemu's configure assumes /usr/local as prefix by default, otherwise.
>> With this patch, qemu config files and manpages are installed under
>> the specified $(PREFIX).
> 
> Is that what we want?

Yes, we want everything that is not explicitely specified
to configure under $(PREFIX).

Christoph

> Or do we want our version of qemu to be
> under /usr/lib/xen?

Re: [PATCH] tools: use PREFIX when building upstream qemu

[Ian Campbell]

Adding Christoph's new address, I guess this is a thing exposed on
NetBSD?

On Thu, 2012-10-25 at 13:39 +0100, Ian Jackson wrote:
> Christoph Egger writes ("[Xen-devel] [PATCH] tools: use PREFIX when building upstream qemu"):
> > 
> > use PREFIX when building upstream qemu.
> > 
> > Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
> 
> This looks reasonable but can you explain what goes wrong when,
> without this ?  I'd like to be able to verify the bug and fix myself.

AFAICT the default PREFIX for qemu-xen is /usr/local and we pass
--bindir, --datadir (as Xen specific paths, like /usr/lib/xen/bin) but
not --prefix. It looks like this covers most stuff but results in a
smattering of stuff getting installed under /usr/local:

$ find dist/install/usr/local/ | grep qemu
dist/install/usr/local/libexec/qemu-bridge-helper
dist/install/usr/local/share/man/man8/qemu-nbd.8
dist/install/usr/local/share/man/man1/qemu.1
dist/install/usr/local/share/man/man1/qemu-img.1
dist/install/usr/local/share/doc/qemu
dist/install/usr/local/share/doc/qemu/qemu-tech.html
dist/install/usr/local/share/doc/qemu/qemu-doc.html
dist/install/usr/local/share/doc/qemu/qmp-commands.txt
dist/install/usr/local/etc/qemu
dist/install/usr/local/etc/qemu/target-x86_64.conf
(there is also some ocaml stuff under there it seems...)

I'm not quite sure that installing those into our $PREFIX is correct
either though -- there seems like the possibility of clashing with a
non-Xen install of qemu, so we might be better off moving these to e.g.
$PREFIX/doc/xen/qemu/ and adding "xen" in the man page path etc? (the
binaries corresponding to those manpages are in /usr/lib/xen/bin/)
Perhaps qemu.1xen ?

I don't know what dist/install/usr/local/etc/qemu/target-x86_64.conf is
but it is empty here. I suspect Xen does not use
dist/install/usr/local/libexec/qemu-bridge-helper or it should be
in /usr/lib/xen/bin.

Ian.

Re: [PATCH] tools: use PREFIX when building upstream qemu

[Christoph Egger]

On 13.12.12 11:40, Ian Campbell wrote:

> Adding Christoph's new address, I guess this is a thing exposed on
> NetBSD?


This is not specific to NetBSD. It is exposed everywhere where you
install Xen into a non-default directory by specifying the prefix
to configure.

Christoph

>
> On Thu, 2012-10-25 at 13:39 +0100, Ian Jackson wrote:
>> Christoph Egger writes ("[Xen-devel] [PATCH] tools: use PREFIX when building upstream qemu"):
>>>
>>> use PREFIX when building upstream qemu.
>>>
>>> Signed-off-by: Christoph Egger<Christoph.Egger@amd.com>
>>
>> This looks reasonable but can you explain what goes wrong when,
>> without this ?  I'd like to be able to verify the bug and fix myself.
>
> AFAICT the default PREFIX for qemu-xen is /usr/local and we pass
> --bindir, --datadir (as Xen specific paths, like /usr/lib/xen/bin) but
> not --prefix. It looks like this covers most stuff but results in a
> smattering of stuff getting installed under /usr/local:
>
> $ find dist/install/usr/local/ | grep qemu
> dist/install/usr/local/libexec/qemu-bridge-helper
> dist/install/usr/local/share/man/man8/qemu-nbd.8
> dist/install/usr/local/share/man/man1/qemu.1
> dist/install/usr/local/share/man/man1/qemu-img.1
> dist/install/usr/local/share/doc/qemu
> dist/install/usr/local/share/doc/qemu/qemu-tech.html
> dist/install/usr/local/share/doc/qemu/qemu-doc.html
> dist/install/usr/local/share/doc/qemu/qmp-commands.txt
> dist/install/usr/local/etc/qemu
> dist/install/usr/local/etc/qemu/target-x86_64.conf
> (there is also some ocaml stuff under there it seems...)
>
> I'm not quite sure that installing those into our $PREFIX is correct
> either though -- there seems like the possibility of clashing with a
> non-Xen install of qemu, so we might be better off moving these to e.g.
> $PREFIX/doc/xen/qemu/ and adding "xen" in the man page path etc? (the
> binaries corresponding to those manpages are in /usr/lib/xen/bin/)
> Perhaps qemu.1xen ?
>
> I don't know what dist/install/usr/local/etc/qemu/target-x86_64.conf is
> but it is empty here. I suspect Xen does not use
> dist/install/usr/local/libexec/qemu-bridge-helper or it should be
> in /usr/lib/xen/bin.
>
> Ian.
>

Re: [PATCH] tools: use PREFIX when building upstream qemu

[Ian Jackson]

Christoph Egger writes ("Re: [Xen-devel] [PATCH] tools: use PREFIX when building upstream qemu"):
> On 13.12.12 11:40, Ian Campbell wrote:
> > Adding Christoph's new address, I guess this is a thing exposed on
> > NetBSD?
> 
> This is not specific to NetBSD. It is exposed everywhere where you
> install Xen into a non-default directory by specifying the prefix
> to configure.

Indeed so.  I think a better way of putting it is that (IIRC) this bug
in our build system was exposed routinely on NetBSD because the NetBSD
ports collection always passes --prefix.  Is that right ?

Ian.

Re: [PATCH] tools: use PREFIX when building upstream qemu

[Christoph Egger]

On 13.12.12 15:25, Ian Jackson wrote:

> Christoph Egger writes ("Re: [Xen-devel] [PATCH] tools: use PREFIX when building upstream qemu"):
>> On 13.12.12 11:40, Ian Campbell wrote:
>>> Adding Christoph's new address, I guess this is a thing exposed on
>>> NetBSD?
>>
>> This is not specific to NetBSD. It is exposed everywhere where you
>> install Xen into a non-default directory by specifying the prefix
>> to configure.
>
> Indeed so.  I think a better way of putting it is that (IIRC) this bug
> in our build system was exposed routinely on NetBSD because the NetBSD
> ports collection always passes --prefix.  Is that right ?


Yes, this is right.

It is also routinely exposed when you choose a different prefix
for different xen versions for development purpose.
I use xen-<c/s> to switch forth and back between different
xen versions. This way I am always able to use a working version
and to test a new changeset.

Christoph

Re: [PATCH] tools: use PREFIX when building upstream qemu

[Ian Jackson]

Christoph Egger writes ("Re: [Xen-devel] [PATCH] tools: use PREFIX when building upstream qemu"):
> Yes, this is right.
> 
> It is also routinely exposed when you choose a different prefix
> for different xen versions for development purpose.
> I use xen-<c/s> to switch forth and back between different
> xen versions. This way I am always able to use a working version
> and to test a new changeset.

Right.  So we'd appreciate your opinion :-).

Ian.

Re: [PATCH] tools: use PREFIX when building upstream qemu

[Christoph Egger]

On 13.12.12 16:07, Ian Jackson wrote:

> Christoph Egger writes ("Re: [Xen-devel] [PATCH] tools: use PREFIX when building upstream qemu"):
>> Yes, this is right.
>>
>> It is also routinely exposed when you choose a different prefix
>> for different xen versions for development purpose.
>> I use xen-<c/s>  to switch forth and back between different
>> xen versions. This way I am always able to use a working version
>> and to test a new changeset.
>
> Right.  So we'd appreciate your opinion :-).


My opinion is: Use PREFIX for default
and use --docdir, --mandir, --bindir, etc.
to specify the other stuff so that everything
goes where it belongs to.

Christoph

Re: [PATCH] tools: use PREFIX when building upstream qemu

[Ian Campbell]

On Thu, 2012-12-13 at 14:22 +0000, Christoph Egger wrote:
> On 13.12.12 11:40, Ian Campbell wrote:
> 
> > Adding Christoph's new address, I guess this is a thing exposed on
> > NetBSD?
> 
> 
> This is not specific to NetBSD. It is exposed everywhere where you
> install Xen into a non-default directory by specifying the prefix
> to configure.

Sorry, I wrote that bit before I'd fully grokked what was going on and
forgot to go back and change it.

> 
> Christoph
> 
> >
> > On Thu, 2012-10-25 at 13:39 +0100, Ian Jackson wrote:
> >> Christoph Egger writes ("[Xen-devel] [PATCH] tools: use PREFIX when building upstream qemu"):
> >>>
> >>> use PREFIX when building upstream qemu.
> >>>
> >>> Signed-off-by: Christoph Egger<Christoph.Egger@amd.com>
> >>
> >> This looks reasonable but can you explain what goes wrong when,
> >> without this ?  I'd like to be able to verify the bug and fix myself.
> >
> > AFAICT the default PREFIX for qemu-xen is /usr/local and we pass
> > --bindir, --datadir (as Xen specific paths, like /usr/lib/xen/bin) but
> > not --prefix. It looks like this covers most stuff but results in a
> > smattering of stuff getting installed under /usr/local:
> >
> > $ find dist/install/usr/local/ | grep qemu
> > dist/install/usr/local/libexec/qemu-bridge-helper
> > dist/install/usr/local/share/man/man8/qemu-nbd.8
> > dist/install/usr/local/share/man/man1/qemu.1
> > dist/install/usr/local/share/man/man1/qemu-img.1
> > dist/install/usr/local/share/doc/qemu
> > dist/install/usr/local/share/doc/qemu/qemu-tech.html
> > dist/install/usr/local/share/doc/qemu/qemu-doc.html
> > dist/install/usr/local/share/doc/qemu/qmp-commands.txt
> > dist/install/usr/local/etc/qemu
> > dist/install/usr/local/etc/qemu/target-x86_64.conf
> > (there is also some ocaml stuff under there it seems...)
> >
> > I'm not quite sure that installing those into our $PREFIX is correct
> > either though -- there seems like the possibility of clashing with a
> > non-Xen install of qemu, so we might be better off moving these to e.g.
> > $PREFIX/doc/xen/qemu/ and adding "xen" in the man page path etc? (the
> > binaries corresponding to those manpages are in /usr/lib/xen/bin/)
> > Perhaps qemu.1xen ?
> >
> > I don't know what dist/install/usr/local/etc/qemu/target-x86_64.conf is
> > but it is empty here. I suspect Xen does not use
> > dist/install/usr/local/libexec/qemu-bridge-helper or it should be
> > in /usr/lib/xen/bin.
> >
> > Ian.
> >
> 
>