motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-04 00:03:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

configure: replace --enable/disable-git-update with --with-git-submodules

Browse source 
Replace the --enable-git-update and --disable-git-update configure params
with the param --with-git-submodules=(update|validate|ignore) to
allow 3 options for building from a git repo.

This is needed because downstream packagers, e.g. Debian, Ubuntu, etc,
also keep the source code in git, but do not want to enable the
'git_update' mode; with the current code, that's not possible even
if the downstream package specifies --disable-git-update.

The previous parameters are deprecated but still available; the
--enable-git-update parameter maps to --with-git-submodules=update and
--disable-git-update parameter maps to --with-git-submodules=validate.

The configure script behavior is slightly modified, where previously
the dtc, capstone, and slirp submodules were not validated when
--disable-git-update was specified (but were updated with git-update
enabled), now they are validated when using --with-git-submodules=validate
and are only ignored when using --with-git-submodules=ignore.

Signed-off-by: Dan Streetman <ddstreet@canonical.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Dan Streetman 2021-01-19 12:20:46 -05:00 • committed by Daniel P. Berrangé
parent f029f91122
commit 7d7dbf9dc1
3 changed files with 66 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

34
scripts/git-submodule.sh
View file

@ -9,9 +9,14 @@ command=$1
shift
maybe_modules="$@"
# if --with-git-submodules=ignore, do nothing
test "$command" = "ignore" && exit 0
test -z "$GIT" && GIT=git
error() {
cd "$(dirname "$0")/.."
update_error() {
echo "$0: $*"
echo
echo "Unable to automatically checkout GIT submodules '$modules'."
@ -24,7 +29,7 @@ error() {
echo "Alternatively you may disable automatic GIT submodule checkout"
echo "with:"
echo
echo " $ ./configure --disable-git-update"
echo " $ ./configure --with-git-submodules=validate"
echo
echo "and then manually update submodules prior to running make, with:"
echo
@ -33,6 +38,19 @@ error() {
exit 1
}
validate_error() {
if test "$1" = "validate"; then
echo "GIT submodules checkout is out of date, and submodules"
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"
fi
exit 1
}
modules=""
for m in $maybe_modules
do
@ -52,18 +70,18 @@ then
fi
case "$command" in
status)
status|validate)
if test -z "$maybe_modules"
then
test -s ${substat} && exit 1 || exit 0
test -s ${substat} && validate_error "$command" || exit 0
fi
test -f "$substat" || exit 1
test -f "$substat" || validate_error "$command"
for module in $modules; do
CURSTATUS=$($GIT submodule status $module)
OLDSTATUS=$(cat $substat | grep $module)
if test "$CURSTATUS" != "$OLDSTATUS"; then
exit 1
validate_error "$command"
fi
done
exit 0
@ -76,10 +94,10 @@ update)
fi
$GIT submodule update --init $modules 1>/dev/null
test $? -ne 0 && error "failed to update modules"
test $? -ne 0 && update_error "failed to update modules"
$GIT submodule status $modules > "${substat}"
test $? -ne 0 && error "failed to save git submodule status" >&2
test $? -ne 0 && update_error "failed to save git submodule status" >&2
;;
esac