1
0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 17:34:18 +03:00

autogen.sh: Restore --no-git (avoid git submodule update)

Prior to 2621d48f00 "gnulib: delete all gnulib integration",
one could pass ./autogen.sh --no-git to prevent the libvirt build
system from running git submodule update.

This feature is needed by systems like the Xen Project CI which want
to explicitly control the revisions of every tree.  These will
typically arrange to initialise the submodules check out the right
version of everything, and then expect the build system not to mess
with it any more.

Despite to the old documentation comments referring only to gnulib,
the --no-git feature is required not only because of gnulib but also
because of the other submodule, src/keycodemapdb.

(And in any case, even if it were no longer required because all the
submodules were removed, it ought ideally to have been retained as a
no-op for compaibility reasons.)

So restore the --no-git feature.

Because of the way the argument parsing of autogen.sh works, it is
easiest to recognise this option only if it comes first.  This works
for the Xen Project CI, which has always passed this option first.

If something else is using this option (and hasn't introduced a
different workaround in the meantime), not in the first position,
then perhaps a more sophisticated approach will be needed.  But I
think this will do for now.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Ian Jackson 2020-06-02 16:47:45 +01:00 committed by Pavel Hrdina
parent e954657959
commit 8915c9cb1f

View File

@ -1,5 +1,10 @@
#!/bin/sh #!/bin/sh
# Run this to generate all the initial makefiles, etc. # Run this to generate all the initial makefiles, etc.
#
# THe following options must come first. All other or subsequent
# arguments are passed to configure:
# --no-git skip `git submodule update --init`
test -n "$srcdir" || srcdir=$(dirname "$0") test -n "$srcdir" || srcdir=$(dirname "$0")
test -n "$srcdir" || srcdir=. test -n "$srcdir" || srcdir=.
@ -13,7 +18,11 @@ cd "$srcdir"
exit 1 exit 1
} }
git submodule update --init || exit 1 if [ "x$1" = x--no-git ]; then
shift
else
git submodule update --init || exit 1
fi
autoreconf --verbose --force --install || exit 1 autoreconf --verbose --force --install || exit 1