mirror of
https://github.com/qemu/qemu.git
synced 2025-07-27 12:20:07 +00:00
37b5e74e28
If going back in time in git history, across a commit that introduces a new submodule, the 'git-submodule.sh' script will fail, causing rebuild to fail. This is because config-host.mak contains a GIT_SUBMODULES variable that lists a submodule that only exists in the later commit. config-host.mak won't get repopulated until config.status is invoked, but make won't get this far due to the submodule error. This change makes 'git-submodule.sh' check whether each module is known to git and drops any which are not present. A warning message will be printed when any submodule is dropped in this manner. Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Eric Blake <eblake@redhat.com> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
78 lines
1.8 KiB
Bash
Executable File
78 lines
1.8 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# This code is licensed under the GPL version 2 or later. See
|
|
# the COPYING file in the top-level directory.
|
|
|
|
substat=".git-submodule-status"
|
|
|
|
command=$1
|
|
shift
|
|
maybe_modules="$@"
|
|
|
|
test -z "$GIT" && GIT=git
|
|
|
|
error() {
|
|
echo "$0: $*"
|
|
echo
|
|
echo "Unable to automatically checkout GIT submodules '$modules'."
|
|
echo "If you require use of an alternative GIT binary (for example to"
|
|
echo "enable use of a transparent proxy), then please specify it by"
|
|
echo "running configure by with the '--with-git' argument. e.g."
|
|
echo
|
|
echo " $ ./configure --with-git='tsocks git'"
|
|
echo
|
|
echo "Alternatively you may disable automatic GIT submodule checkout"
|
|
echo "with:"
|
|
echo
|
|
echo " $ ./configure --disable-git-update'"
|
|
echo
|
|
echo "and then manually update submodules prior to running make, with:"
|
|
echo
|
|
echo " $ scripts/git-sbumodule.sh update $modules"
|
|
echo
|
|
exit 1
|
|
}
|
|
|
|
if test -z "$maybe_modules"
|
|
then
|
|
test -e $substat || touch $substat
|
|
exit 0
|
|
fi
|
|
|
|
modules=""
|
|
for m in $maybe_modules
|
|
do
|
|
$GIT submodule status $m 1> /dev/null 2>&1
|
|
if test $? = 0
|
|
then
|
|
modules="$modules $m"
|
|
else
|
|
echo "warn: ignoring non-existent submodule $m"
|
|
fi
|
|
done
|
|
|
|
if ! test -e ".git"
|
|
then
|
|
echo "$0: unexpectedly called with submodules but no git checkout exists"
|
|
exit 1
|
|
fi
|
|
|
|
case "$command" in
|
|
status)
|
|
test -f "$substat" || exit 1
|
|
CURSTATUS=`$GIT submodule status $modules`
|
|
OLDSTATUS=`cat $substat`
|
|
test "$CURSTATUS" = "$OLDSTATUS"
|
|
exit $?
|
|
;;
|
|
update)
|
|
$GIT submodule update --init $modules 1>/dev/null
|
|
test $? -ne 0 && error "failed to update modules"
|
|
|
|
$GIT submodule status $modules > "${substat}"
|
|
test $? -ne 0 && error "failed to save git submodule status" >&2
|
|
;;
|
|
esac
|
|
|
|
exit 0
|