[PATCH] tools/Makefile: unset MAKELEVEL before building QEMU

[PATCH] tools/Makefile: unset MAKELEVEL before building QEMU

[Anthony PERARD]

Since QEMU commits aef45d51d1204f3335fb99de6658e0c5612c2b67
"build: automatically handle GIT submodule checkout for dtc"
the QEMU makefiles rely on the variable MAKELEVEL to make a decision on
whether to update some git submodules or not. Since we call QEMU build
from within the Xen one, MAKELEVEL would already be greater than 0 and
the git submodules would not be updated and QEMU would fail to build.

Fix this by removing MAKELEVEL from the environment before trying to
build QEMU.

Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
---
 tools/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/Makefile b/tools/Makefile
index 84d6e3b4e4..ab7a01ee1b 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -217,6 +217,7 @@ QEMU_XEN_ENABLE_DEBUG :=
 endif
 
 subdir-all-qemu-xen-dir: qemu-xen-dir-find
+	unset MAKELEVEL; \
 	if test -d $(QEMU_UPSTREAM_LOC) ; then \
 		source=$(QEMU_UPSTREAM_LOC); \
 	else \
-- 
Anthony PERARD


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

Re: [PATCH] tools/Makefile: unset MAKELEVEL before building QEMU

[Ian Jackson]

Anthony PERARD writes ("[PATCH] tools/Makefile: unset MAKELEVEL before building QEMU"):
> Since QEMU commits aef45d51d1204f3335fb99de6658e0c5612c2b67
> "build: automatically handle GIT submodule checkout for dtc"
> the QEMU makefiles rely on the variable MAKELEVEL to make a decision on
> whether to update some git submodules or not. Since we call QEMU build
> from within the Xen one, MAKELEVEL would already be greater than 0 and
> the git submodules would not be updated and QEMU would fail to build.
> 
> Fix this by removing MAKELEVEL from the environment before trying to
> build QEMU.

Urgh.

I think this is a bug in the qemu makefiles.  But also, use of git
submodules is a bug in itself.  None of that is likely to be fixed.

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

Ian.

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

Re: [PATCH] tools/Makefile: unset MAKELEVEL before building QEMU

[Julien Grall]

Hi,

On 19/10/17 16:19, Ian Jackson wrote:
> Anthony PERARD writes ("[PATCH] tools/Makefile: unset MAKELEVEL before building QEMU"):
>> Since QEMU commits aef45d51d1204f3335fb99de6658e0c5612c2b67
>> "build: automatically handle GIT submodule checkout for dtc"
>> the QEMU makefiles rely on the variable MAKELEVEL to make a decision on
>> whether to update some git submodules or not. Since we call QEMU build
>> from within the Xen one, MAKELEVEL would already be greater than 0 and
>> the git submodules would not be updated and QEMU would fail to build.
>>
>> Fix this by removing MAKELEVEL from the environment before trying to
>> build QEMU.
> 
> Urgh.
> 
> I think this is a bug in the qemu makefiles.  But also, use of git
> submodules is a bug in itself.  None of that is likely to be fixed.
> 
> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

Release-acked-by: Julien Grall <julien.grall@linaro.org>

Cheers,

> 
> Ian.
> 

-- 
Julien Grall

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