[PATCH] tools/Makefile: fix qemu-xen-traditional build

[PATCH] tools/Makefile: fix qemu-xen-traditional build

[Wei Liu]

In d9740237a ("tools: unhook blktap1 from the build and remove all
references to it"), one spot was left unchanged, which leads to failure
in building qemu-xen-traditional.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
---
 tools/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/Makefile b/tools/Makefile
index 1ad7a5d..5d7a75f 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -158,6 +158,7 @@ qemu-xen-traditional-dir-force-update: qemu-xen-traditional-dir-find
 subdir-all-qemu-xen-traditional-dir: qemu-xen-traditional-dir-find
 	set -e; \
 		$(buildmakevars2shellvars); \
+		export CONFIG_BLKTAP1=n; \
 		cd qemu-xen-traditional-dir; \
 		$(QEMU_ROOT)/xen-setup \
 		$(IOEMU_EXTRA_LDFLAGS) \
-- 
1.9.1

Re: [PATCH] tools/Makefile: fix qemu-xen-traditional build

[Olaf Hering]

On Sun, Jan 25, Wei Liu wrote:

> In d9740237a ("tools: unhook blktap1 from the build and remove all
> references to it"), one spot was left unchanged, which leads to failure
> in building qemu-xen-traditional.

Another one.  I suspect there is more like that in qemu-xen-traditional.
Should I spent/waste my time to convert qemu-xen-traditional to handle
options via configure instead of relying on variables from the Xen
buildsystem? The same happend when my --prefix series was applied.

Olaf

Re: [PATCH] tools/Makefile: fix qemu-xen-traditional build

[Ian Campbell]

On Sun, 2015-01-25 at 15:38 +0000, Wei Liu wrote:
> In d9740237a ("tools: unhook blktap1 from the build and remove all
> references to it"), one spot was left unchanged, which leads to failure
> in building qemu-xen-traditional.

Well spotted, which make invocation hits this path? make dist (what I
test) didn't.


> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> Cc: Ian Campbell <ian.campbell@citrix.com>
> Cc: Ian Jackson <ian.jackson@eu.citrix.com>

Acked-by: Ian Campbell <ian.campbell@citrix.com>

Should we be worried that the -all- and -install- targets are similar
but not identical? Specifically one of them lack --extra-cflags?

Perhaps we should refactor those so the options are only given ones?

> ---
>  tools/Makefile | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/tools/Makefile b/tools/Makefile
> index 1ad7a5d..5d7a75f 100644
> --- a/tools/Makefile
> +++ b/tools/Makefile
> @@ -158,6 +158,7 @@ qemu-xen-traditional-dir-force-update: qemu-xen-traditional-dir-find
>  subdir-all-qemu-xen-traditional-dir: qemu-xen-traditional-dir-find
>  	set -e; \
>  		$(buildmakevars2shellvars); \
> +		export CONFIG_BLKTAP1=n; \
>  		cd qemu-xen-traditional-dir; \
>  		$(QEMU_ROOT)/xen-setup \
>  		$(IOEMU_EXTRA_LDFLAGS) \

Re: [PATCH] tools/Makefile: fix qemu-xen-traditional build

[Wei Liu]

On Mon, Jan 26, 2015 at 09:31:44AM +0100, Olaf Hering wrote:
> On Sun, Jan 25, Wei Liu wrote:
> 
> > In d9740237a ("tools: unhook blktap1 from the build and remove all
> > references to it"), one spot was left unchanged, which leads to failure
> > in building qemu-xen-traditional.
> 
> Another one.  I suspect there is more like that in qemu-xen-traditional.
> Should I spent/waste my time to convert qemu-xen-traditional to handle
> options via configure instead of relying on variables from the Xen
> buildsystem? The same happend when my --prefix series was applied.
> 

qemu-xen-traditional's configure is quite ancient I don't think that's
worth it.

> Olaf

Re: [PATCH] tools/Makefile: fix qemu-xen-traditional build

[Ian Campbell]

On Mon, 2015-01-26 at 10:01 +0000, Wei Liu wrote:
> On Mon, Jan 26, 2015 at 09:31:44AM +0100, Olaf Hering wrote:
> > On Sun, Jan 25, Wei Liu wrote:
> > 
> > > In d9740237a ("tools: unhook blktap1 from the build and remove all
> > > references to it"), one spot was left unchanged, which leads to failure
> > > in building qemu-xen-traditional.
> > 
> > Another one.  I suspect there is more like that in qemu-xen-traditional.
> > Should I spent/waste my time to convert qemu-xen-traditional to handle
> > options via configure instead of relying on variables from the Xen
> > buildsystem? The same happend when my --prefix series was applied.
> > 
> 
> qemu-xen-traditional's configure is quite ancient I don't think that's
> worth it.

It's also not autoconf (neither is mainline qemu's AFAIK), it's just a
hand written shell script...

Ian.

Re: [PATCH] tools/Makefile: fix qemu-xen-traditional build

[Wei Liu]

On Mon, Jan 26, 2015 at 09:55:41AM +0000, Ian Campbell wrote:
> On Sun, 2015-01-25 at 15:38 +0000, Wei Liu wrote:
> > In d9740237a ("tools: unhook blktap1 from the build and remove all
> > references to it"), one spot was left unchanged, which leads to failure
> > in building qemu-xen-traditional.
> 
> Well spotted, which make invocation hits this path? make dist (what I
> test) didn't.
> 

make -C tools build.

> 
> > Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> > Cc: Ian Campbell <ian.campbell@citrix.com>
> > Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> 
> Acked-by: Ian Campbell <ian.campbell@citrix.com>
> 
> Should we be worried that the -all- and -install- targets are similar
> but not identical? Specifically one of them lack --extra-cflags?
> 

Perhaps nobody ever provides EXTRA_CFLAGS_QEMU_TRADITIONAL so nobody
ever trips over that.

> Perhaps we should refactor those so the options are only given ones?
> 

This is a good idea. I can do another patch later.

Wei.

> > ---
> >  tools/Makefile | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/tools/Makefile b/tools/Makefile
> > index 1ad7a5d..5d7a75f 100644
> > --- a/tools/Makefile
> > +++ b/tools/Makefile
> > @@ -158,6 +158,7 @@ qemu-xen-traditional-dir-force-update: qemu-xen-traditional-dir-find
> >  subdir-all-qemu-xen-traditional-dir: qemu-xen-traditional-dir-find
> >  	set -e; \
> >  		$(buildmakevars2shellvars); \
> > +		export CONFIG_BLKTAP1=n; \
> >  		cd qemu-xen-traditional-dir; \
> >  		$(QEMU_ROOT)/xen-setup \
> >  		$(IOEMU_EXTRA_LDFLAGS) \
> 

Re: [PATCH] tools/Makefile: fix qemu-xen-traditional build

[Ian Campbell]

On Mon, 2015-01-26 at 11:05 +0000, Wei Liu wrote:
> On Mon, Jan 26, 2015 at 09:55:41AM +0000, Ian Campbell wrote:
> > On Sun, 2015-01-25 at 15:38 +0000, Wei Liu wrote:
> > > In d9740237a ("tools: unhook blktap1 from the build and remove all
> > > references to it"), one spot was left unchanged, which leads to failure
> > > in building qemu-xen-traditional.
> > 
> > Well spotted, which make invocation hits this path? make dist (what I
> > test) didn't.
> > 
> 
> make -C tools build.
> 
> > 
> > > Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> > > Cc: Ian Campbell <ian.campbell@citrix.com>
> > > Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> > 
> > Acked-by: Ian Campbell <ian.campbell@citrix.com>

And applied.

> > 
> > Should we be worried that the -all- and -install- targets are similar
> > but not identical? Specifically one of them lack --extra-cflags?
> > 
> 
> Perhaps nobody ever provides EXTRA_CFLAGS_QEMU_TRADITIONAL so nobody
> ever trips over that.

Probably true, or at least those people who do use make dist etc.

> > Perhaps we should refactor those so the options are only given ones?
> > 
> 
> This is a good idea. I can do another patch later.

Thanks..