Re: [Qemu-devel] [PULL 01/11] build: automatically handle GIT submodule checkout for dtc

[Daniel P. Berrange]

On Thu, Oct 19, 2017 at 03:05:45PM +0100, Anthony PERARD wrote:
> On Mon, Oct 16, 2017 at 03:16:34PM +0200, Gerd Hoffmann wrote:
> > From: "Daniel P. Berrange" <address@hidden>
> > 
> > Currently if DTC is required by configure and not available in the host
> > OS install, we exit with an error message telling the user to checkout a
> > git submodule or install the library.
> > 
> > This introduces automatic handling of the git submodule checkout process
> > and enables it for dtc. This only runs if building from GIT, so users of
> > release tarballs still need the system library install. The current state
> > of the git checkout is stashed in .git-submodule-status, and a helper
> > program is used to determine if this state matches the desired submodule
> > state. A dependency against 'Makefile' ensures that the submodule state
> > is refreshed at the start of the build process
> > 
> > Signed-off-by: Daniel P. Berrange <address@hidden>
> > Message-id: address@hidden
> > 
> > [ kraxel: use /bin/sh not bash for scripts/git-submodule.sh ]
> > [ kraxel: fix Makefile dependencies ]
> > 
> > Signed-off-by: Gerd Hoffmann <address@hidden>
> > 
> > [fixup] Makefile dep
> > ---
> 
> > diff --git a/Makefile b/Makefile
> > index 97b4508d7d..9866909e08 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -14,6 +14,27 @@ ifneq ($(wildcard config-host.mak),)
> >  all:
> >  include config-host.mak
> >  
> > +git-submodule-update:
> > +
> > +.PHONY: git-submodule-update
> > +
> > +ifeq (0,$(MAKELEVEL))
> 
> Hi,
> 
> this new patch, and especialy the use MAKELEVEL here does not work when
> we build Xen, since we build QEMU when building Xen.
> 
> When Xen is built, a clone of qemu.git is made, and then configure/make
> is called. At this point, MAKELEVEL would already be set so
> the makefile rule git-submodule-update would be empty.
> 
> Is it possible to do things differently in the QEMU makefiles? (Or do we
> have to simply unset MAKELEVEL in xen makefiles before building qemu.)

If it is practical from the Xen side, I think it would be preferrable
to unset MAKELEVEL when jumping in to build QEMU, that way any part of
QEMU makefiles can rely on MAKELEVEL being set normally.

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|