[libvirt] [PATCH v2 12/12] autogen.sh: remove --no-git and --gnulib-srcdir options
Now that we have bootstrap output stored in git there is no need for
these options.
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
autogen.sh | 29 +++--------------------------
docs/compiling.html.in | 13 -------------
2 files changed, 3 insertions(+), 39 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index f20a61ed29..f947c3f963 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -20,24 +20,9 @@ test -f src/libvirt.c || {
die "$0 must live in the top-level libvirt directory"
}
-no_git=
-gnulib_srcdir=
extra_args=
while test "$#" -gt 0; do
case "$1" in
- --no-git)
- no_git=" $1"
- shift
- ;;
- --gnulib-srcdir=*)
- gnulib_srcdir=" $1"
- shift
- ;;
- --gnulib-srcdir)
- gnulib_srcdir=" $1=$2"
- shift
- shift
- ;;
--system)
prefix=/usr
sysconfdir=/etc
@@ -57,17 +42,9 @@ while test "$#" -gt 0; do
;;
esac
done
-no_git="$no_git$gnulib_srcdir"
gnulib_hash()
{
- local no_git=$1
-
- if test "$no_git"; then
- echo "no-git"
- return
- fi
-
# Compute the hash we'll use to determine whether rerunning bootstrap
# is required. The first is just the SHA1 that selects a gnulib snapshot.
# The second ensures that whenever we change the set of gnulib modules used
@@ -94,7 +71,7 @@ if test -d .git || test -f .git; then
esac
done
fi
- if test "$CLEAN_SUBMODULE" && test -z "$no_git"; then
+ if test "$CLEAN_SUBMODULE"; then
echo "Cleaning up submodules..."
git submodule foreach 'git clean -dfqx && git reset --hard' || {
die "Cleaning up submodules failed"
@@ -113,7 +90,7 @@ if test -d .git || test -f .git; then
# successful bootstrap run, is stored on disk
state_file=.git-module-status
expected_hash=$(cat "$state_file" 2>/dev/null)
- actual_hash=$(gnulib_hash "$no_git")
+ actual_hash=$(gnulib_hash)
if test "$actual_hash" = "$expected_hash"; then
# The gnulib hash matches our expectations, and all the files
@@ -128,7 +105,7 @@ if test -d .git || test -f .git; then
# has been changed in some way (see gnulib_hash) we need to
# run bootstrap again.
echo "Running bootstrap..."
- ./bootstrap$no_git || {
+ ./bootstrap || {
die "bootstrap failed"
}
gnulib_hash >"$state_file"
diff --git a/docs/compiling.html.in b/docs/compiling.html.in
index 5869ebb90f..31833decc6 100644
--- a/docs/compiling.html.in
+++ b/docs/compiling.html.in
@@ -82,19 +82,6 @@ $ <b>sudo</b> <i>make install</i></pre>
disk space requirements and network download time, regardless of
which actual commit you have in that reference directory.
</p>
- <p>
- However, if you are developing on a platform where git is not
- available, or are behind a firewall that does not allow for git
- to easily obtain the gnulib submodule, it is possible to instead
- use a static mode of operation where you are then responsible
- for updating the git submodule yourself. In this mode, you must
- track the exact gnulib commit needed by libvirt (usually not the
- latest gnulib.git) via alternative means, such as a shared NFS
- drive or manual download, and run this any time libvirt.git
- updates the commit stored in the .gnulib submodule:</p>
- <pre>
-$ GNULIB_SRCDIR=/path/to/gnulib ./autogen.sh --no-git
- </pre>
<p>To build & install libvirt to your home
directory the following commands can be run:
--
2.24.1