mirror of https://github.com/proxmox/mirror_qemu
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>master
parent
1f468152fb
commit
6f3ae23b29
|
@ -246,13 +246,7 @@ for opt do
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
||||||
if test -e "$source_path/.git"
|
git_submodules_action="update"
|
||||||
then
|
|
||||||
git_submodules_action="update"
|
|
||||||
else
|
|
||||||
git_submodules_action="ignore"
|
|
||||||
fi
|
|
||||||
|
|
||||||
git="git"
|
git="git"
|
||||||
debug_tcg="no"
|
debug_tcg="no"
|
||||||
docs="auto"
|
docs="auto"
|
||||||
|
@ -738,12 +732,9 @@ for opt do
|
||||||
;;
|
;;
|
||||||
--disable-cfi) cfi="false"
|
--disable-cfi) cfi="false"
|
||||||
;;
|
;;
|
||||||
--with-git-submodules=*)
|
--disable-download) download="disabled"; git_submodules_action=validate;
|
||||||
git_submodules_action="$optarg"
|
|
||||||
;;
|
;;
|
||||||
--disable-download) download="disabled"
|
--enable-download) download="enabled"; git_submodules_action=update;
|
||||||
;;
|
|
||||||
--enable-download) download="enabled"
|
|
||||||
;;
|
;;
|
||||||
--enable-plugins) if test "$mingw32" = "yes"; then
|
--enable-plugins) if test "$mingw32" = "yes"; then
|
||||||
error_exit "TCG plugins not currently supported on Windows platforms"
|
error_exit "TCG plugins not currently supported on Windows platforms"
|
||||||
|
@ -765,6 +756,11 @@ for opt do
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
|
if ! test -e "$source_path/.git"
|
||||||
|
then
|
||||||
|
git_submodules_action="ignore"
|
||||||
|
fi
|
||||||
|
|
||||||
# test for any invalid configuration combinations
|
# test for any invalid configuration combinations
|
||||||
if test "$plugins" = "yes" -a "$tcg" = "disabled"; then
|
if test "$plugins" = "yes" -a "$tcg" = "disabled"; then
|
||||||
error_exit "Can't enable plugins on non-TCG builds"
|
error_exit "Can't enable plugins on non-TCG builds"
|
||||||
|
@ -796,21 +792,6 @@ then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
case $git_submodules_action in
|
|
||||||
update|validate)
|
|
||||||
if test ! -e "$source_path/.git" || ! has git; then
|
|
||||||
echo "ERROR: cannot $git_submodules_action git submodules without .git"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
ignore)
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo "ERROR: invalid --with-git-submodules= value '$git_submodules_action'"
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
default_target_list=""
|
default_target_list=""
|
||||||
mak_wilds=""
|
mak_wilds=""
|
||||||
|
|
||||||
|
@ -877,9 +858,6 @@ Advanced options (experts only):
|
||||||
--python=PYTHON use specified python [$python]
|
--python=PYTHON use specified python [$python]
|
||||||
--ninja=NINJA use specified ninja [$ninja]
|
--ninja=NINJA use specified ninja [$ninja]
|
||||||
--smbd=SMBD use specified smbd [$smbd]
|
--smbd=SMBD use specified smbd [$smbd]
|
||||||
--with-git-submodules=update update git submodules (default if .git dir exists)
|
|
||||||
--with-git-submodules=validate fail if git submodules are not up to date
|
|
||||||
--with-git-submodules=ignore do not update or check git submodules (default if no .git dir)
|
|
||||||
--static enable static build [$static]
|
--static enable static build [$static]
|
||||||
--bindir=PATH install binaries in PATH
|
--bindir=PATH install binaries in PATH
|
||||||
--with-suffix=SUFFIX suffix for QEMU data inside datadir/libdir/sysconfdir/docdir [$qemu_suffix]
|
--with-suffix=SUFFIX suffix for QEMU data inside datadir/libdir/sysconfdir/docdir [$qemu_suffix]
|
||||||
|
@ -1024,7 +1002,7 @@ fi
|
||||||
# Consult white-list to determine whether to enable werror
|
# Consult white-list to determine whether to enable werror
|
||||||
# by default. Only enable by default for git builds
|
# by default. Only enable by default for git builds
|
||||||
if test -z "$werror" ; then
|
if test -z "$werror" ; then
|
||||||
if test "$git_submodules_action" != "ignore" && \
|
if test -e "$source_path/.git" && \
|
||||||
{ test "$linux" = "yes" || test "$mingw32" = "yes"; }; then
|
{ test "$linux" = "yes" || test "$mingw32" = "yes"; }; then
|
||||||
werror="yes"
|
werror="yes"
|
||||||
else
|
else
|
||||||
|
|
|
@ -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" \
|
--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" \
|
--with-suffix="qemu-kvm" \
|
||||||
--firmwarepath=/usr/share/qemu-firmware \
|
--firmwarepath=/usr/share/qemu-firmware \
|
||||||
--with-git-submodules=update \
|
|
||||||
--target-list="x86_64-softmmu" \
|
--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" \
|
--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="" \
|
--audio-drv-list="" \
|
||||||
|
|
|
@ -9,7 +9,7 @@ command=$1
|
||||||
shift
|
shift
|
||||||
maybe_modules="$@"
|
maybe_modules="$@"
|
||||||
|
|
||||||
# if --with-git-submodules=ignore, do nothing
|
# if not running in a git checkout, do nothing
|
||||||
test "$command" = "ignore" && exit 0
|
test "$command" = "ignore" && exit 0
|
||||||
|
|
||||||
test -z "$GIT" && GIT=$(command -v git)
|
test -z "$GIT" && GIT=$(command -v git)
|
||||||
|
@ -24,7 +24,7 @@ update_error() {
|
||||||
echo "enable use of a transparent proxy), please disable automatic"
|
echo "enable use of a transparent proxy), please disable automatic"
|
||||||
echo "GIT submodule checkout with:"
|
echo "GIT submodule checkout with:"
|
||||||
echo
|
echo
|
||||||
echo " $ ./configure --with-git-submodules=validate"
|
echo " $ ./configure --disable-download"
|
||||||
echo
|
echo
|
||||||
echo "and then manually update submodules prior to running make, with:"
|
echo "and then manually update submodules prior to running make, with:"
|
||||||
echo
|
echo
|
||||||
|
@ -39,9 +39,7 @@ validate_error() {
|
||||||
echo "configured for validate only. Please run"
|
echo "configured for validate only. Please run"
|
||||||
echo " scripts/git-submodule.sh update $maybe_modules"
|
echo " scripts/git-submodule.sh update $maybe_modules"
|
||||||
echo "from the source directory or call configure with"
|
echo "from the source directory or call configure with"
|
||||||
echo " --with-git-submodules=update"
|
echo " --enable-download"
|
||||||
echo "To disable GIT submodules validation, use"
|
|
||||||
echo " --with-git-submodules=ignore"
|
|
||||||
fi
|
fi
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue