7d7dbf9dc1
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>
105 lines
2.7 KiB
Bash
Executable file
105 lines
2.7 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="$@"
|
|
|
|
# if --with-git-submodules=ignore, do nothing
|
|
test "$command" = "ignore" && exit 0
|
|
|
|
test -z "$GIT" && GIT=git
|
|
|
|
cd "$(dirname "$0")/.."
|
|
|
|
update_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 --with-git-submodules=validate"
|
|
echo
|
|
echo "and then manually update submodules prior to running make, with:"
|
|
echo
|
|
echo " $ scripts/git-submodule.sh update $modules"
|
|
echo
|
|
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
|
|
$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 -n "$maybe_modules" && ! test -e ".git"
|
|
then
|
|
echo "$0: unexpectedly called with submodules but no git checkout exists"
|
|
exit 1
|
|
fi
|
|
|
|
case "$command" in
|
|
status|validate)
|
|
if test -z "$maybe_modules"
|
|
then
|
|
test -s ${substat} && validate_error "$command" || exit 0
|
|
fi
|
|
|
|
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
|
|
validate_error "$command"
|
|
fi
|
|
done
|
|
exit 0
|
|
;;
|
|
update)
|
|
if test -z "$maybe_modules"
|
|
then
|
|
test -e $substat || touch $substat
|
|
exit 0
|
|
fi
|
|
|
|
$GIT submodule update --init $modules 1>/dev/null
|
|
test $? -ne 0 && update_error "failed to update modules"
|
|
|
|
$GIT submodule status $modules > "${substat}"
|
|
test $? -ne 0 && update_error "failed to save git submodule status" >&2
|
|
;;
|
|
esac
|
|
|
|
exit 0
|