configure: remove --with-git-submodules=

Reuse --enable/--disable-download to control git submodules as well.
Adjust the error messages of git-submodule.sh to refer to the new
option.

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini
2023-05-30 16:03:50 +02:00
parent 1f468152fb
commit 6f3ae23b29
3 changed files with 12 additions and 37 deletions

View File

@@ -29,7 +29,6 @@
--extra-cflags="-O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection" \
--with-suffix="qemu-kvm" \
--firmwarepath=/usr/share/qemu-firmware \
--with-git-submodules=update \
--target-list="x86_64-softmmu" \
--block-drv-rw-whitelist="qcow2,raw,file,host_device,nbd,iscsi,rbd,blkdebug,luks,null-co,nvme,copy-on-read,throttle,gluster" \
--audio-drv-list="" \

View File

@@ -9,7 +9,7 @@ command=$1
shift
maybe_modules="$@"
# if --with-git-submodules=ignore, do nothing
# if not running in a git checkout, do nothing
test "$command" = "ignore" && exit 0
test -z "$GIT" && GIT=$(command -v git)
@@ -24,7 +24,7 @@ update_error() {
echo "enable use of a transparent proxy), please disable automatic"
echo "GIT submodule checkout with:"
echo
echo " $ ./configure --with-git-submodules=validate"
echo " $ ./configure --disable-download"
echo
echo "and then manually update submodules prior to running make, with:"
echo
@@ -39,9 +39,7 @@ validate_error() {
echo "configured for validate only. Please run"
echo " scripts/git-submodule.sh update $maybe_modules"
echo "from the source directory or call configure with"
echo " --with-git-submodules=update"
echo "To disable GIT submodules validation, use"
echo " --with-git-submodules=ignore"
echo " --enable-download"
fi
exit 1
}