tools/Makefile: Fix build of QEMU, remove --source-path

[Xen-devel] [PATCH] tools/Makefile: Fix build of QEMU, remove --source-path

Posted by Anthony PERARD 4 years, 11 months ago

Following QEMU's commit 79d77bcd36 (configure: Remove --source-path
option), Xen's build system fails to build qemu-xen. The --source-path
option gives redundant information about the location of the sources
so simply remove it. (configure already looks at its $0 to find the
source-path.)

Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
---
This patch would unblock the qemu-mainline branch in osstest.
---
 tools/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tools/Makefile b/tools/Makefile
index c903d6a63e..99cbc950dc 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -246,7 +246,6 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find
 		--prefix=$(LIBEXEC) \
 		--libdir=$(LIBEXEC_LIB) \
 		--includedir=$(LIBEXEC_INC) \
-		--source-path=$$source \
 		--extra-cflags="-DXC_WANT_COMPAT_EVTCHN_API=1 \
 		-DXC_WANT_COMPAT_GNTTAB_API=1 \
 		-DXC_WANT_COMPAT_MAP_FOREIGN_API=1 \
-- 
Anthony PERARD


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [Xen-devel] [PATCH] tools/Makefile: Fix build of QEMU, remove --source-path

Posted by Ian Jackson 4 years, 11 months ago

Adding Stefano for archaelogical reasons.

Anthony PERARD writes ("[PATCH] tools/Makefile: Fix build of QEMU, remove --source-path"):
> Following QEMU's commit 79d77bcd36 (configure: Remove --source-path
> option), Xen's build system fails to build qemu-xen. The --source-path
> option gives redundant information about the location of the sources
> so simply remove it. (configure already looks at its $0 to find the
> source-path.)

For Xen staging:

Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

I wanted to follow the principle of Chesterton's Fence [1],
particularly to know how far back to backport this change, so I
checked the git history.  This option has been passed since the very
first time xen.git built qemu upstream, in
   e737b4333bb287b6134a89edff2bde2a7e048a9e
   Clone and build upstream Qemu by default

Stefano, can you remember anything about this ?  DYK how far back we
should backport this change ?

Thanks,
Ian.

[1] https://en.wikipedia.org/wiki/Chesterton%27s_fence#Chesterton's_fence

> Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
> ---
> This patch would unblock the qemu-mainline branch in osstest.
> ---
>  tools/Makefile | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/tools/Makefile b/tools/Makefile
> index c903d6a63e..99cbc950dc 100644
> --- a/tools/Makefile
> +++ b/tools/Makefile
> @@ -246,7 +246,6 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find
>  		--prefix=$(LIBEXEC) \
>  		--libdir=$(LIBEXEC_LIB) \
>  		--includedir=$(LIBEXEC_INC) \
> -		--source-path=$$source \
>  		--extra-cflags="-DXC_WANT_COMPAT_EVTCHN_API=1 \
>  		-DXC_WANT_COMPAT_GNTTAB_API=1 \
>  		-DXC_WANT_COMPAT_MAP_FOREIGN_API=1 \
> -- 
> Anthony PERARD
> 

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [Xen-devel] [PATCH] tools/Makefile: Fix build of QEMU, remove --source-path

Posted by Stefano Stabellini 4 years, 11 months ago

On Fri, 3 May 2019, Ian Jackson wrote:
> Adding Stefano for archaelogical reasons.
> 
> Anthony PERARD writes ("[PATCH] tools/Makefile: Fix build of QEMU, remove --source-path"):
> > Following QEMU's commit 79d77bcd36 (configure: Remove --source-path
> > option), Xen's build system fails to build qemu-xen. The --source-path
> > option gives redundant information about the location of the sources
> > so simply remove it. (configure already looks at its $0 to find the
> > source-path.)
> 
> For Xen staging:
> 
> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
> 
> I wanted to follow the principle of Chesterton's Fence [1],
> particularly to know how far back to backport this change, so I
> checked the git history.  This option has been passed since the very
> first time xen.git built qemu upstream, in
>    e737b4333bb287b6134a89edff2bde2a7e048a9e
>    Clone and build upstream Qemu by default
> 
> Stefano, can you remember anything about this ?  DYK how far back we
> should backport this change ?

Unfortunately I don't remember. To stay on the safe side, I would test
each backport before pushing it if I were you.


> [1] https://en.wikipedia.org/wiki/Chesterton%27s_fence#Chesterton's_fence
> 
> > Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
> > ---
> > This patch would unblock the qemu-mainline branch in osstest.
> > ---
> >  tools/Makefile | 1 -
> >  1 file changed, 1 deletion(-)
> > 
> > diff --git a/tools/Makefile b/tools/Makefile
> > index c903d6a63e..99cbc950dc 100644
> > --- a/tools/Makefile
> > +++ b/tools/Makefile
> > @@ -246,7 +246,6 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find
> >  		--prefix=$(LIBEXEC) \
> >  		--libdir=$(LIBEXEC_LIB) \
> >  		--includedir=$(LIBEXEC_INC) \
> > -		--source-path=$$source \
> >  		--extra-cflags="-DXC_WANT_COMPAT_EVTCHN_API=1 \
> >  		-DXC_WANT_COMPAT_GNTTAB_API=1 \
> >  		-DXC_WANT_COMPAT_MAP_FOREIGN_API=1 \
> > -- 
> > Anthony PERARD
> > 
> 

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel