mirror of https://gitlab.com/qemu-project/qemu
Merge build 2017/11/07 v1
-----BEGIN PGP SIGNATURE----- iQIcBAABCAAGBQJaAYeZAAoJEL6G67QVEE/fuCwP/3TgBkGEyqsH4CrYLtpOZLZF 0eRx8vzBNhuCgIuiMItAbxKHSJKHhhTZIad6J0tJOTYhtEfLZHKh3USSF28KcaYd 8/8aYRZdaMO4QK66Lfl/PwebZ5FiD5xb9qTJ9SkHARsHeIogwTcGAkvDhcdVzFtw RC7thETESoEpdx6FtVEl95+nfK3C9Fltm9LR6i9u2gsbvoVPp+w3EflhEBlCCdrJ Kdc0+GX0EWsVZ7NoU79vUQ5LswGUn+ZwSZB5DLVeCWXbKbgAKCBIwZNet06p60RD RuNyG8ivH+s6pSKTqgTIKPeZkwtqnVmjqBVfUEZsTEDgvtYpaXb25XyZLdDbBUCS a06RkB03xZVgVY15HL9X7bhVhZVZ56WuLokvHi4LbXjga3+V7ldOcBh21BbUhGnD NAuR186SeyCG84HdhSFKebA6xDQMjoLrqo0Y9YfTZUjX2jLlDzpeP337RSKyaO1B eLFLekx1PU4OS+QPG+TOjN8fplxNdv46xoW+VgGClDVjOSbnrUQRRe4GfaLuJRqs jXs+k9Me3oJWit6UG2gv3sWOGxqGMZKvjTsVKvi1HaQKx2bgd+bzNL7VurvqiEy9 QLyLP5lYX7riuLnrkavJUxt0vWPVEmfzdL+hrTLTb/cXc5qH0FFBQx0yaTgAmCwA /cUrxI2xu2VZKwUXH/Xs =TdMN -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/berrange/tags/pull-build-2017-11-07-1' into staging Merge build 2017/11/07 v1 # gpg: Signature made Tue 07 Nov 2017 10:14:49 GMT # gpg: using RSA key 0xBE86EBB415104FDF # gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>" # gpg: aka "Daniel P. Berrange <berrange@redhat.com>" # Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF * remotes/berrange/tags/pull-build-2017-11-07-1: build: remove use of MAKELEVEL optimization in submodule handling build: delay check for empty git submodule list build: don't fail if given a git submodule which does not exist build: allow automatic git submodule updates to be disabled build: don't create temporary files in source dir build: allow setting a custom GIT binary for transparent proxying Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
commit
0e82cdd012
15
Makefile
15
Makefile
|
|
@ -18,17 +18,26 @@ git-submodule-update:
|
|||
|
||||
.PHONY: git-submodule-update
|
||||
|
||||
ifeq (0,$(MAKELEVEL))
|
||||
git_module_status := $(shell \
|
||||
cd '$(SRC_PATH)' && \
|
||||
./scripts/git-submodule.sh status $(GIT_SUBMODULES); \
|
||||
GIT="$(GIT)" ./scripts/git-submodule.sh status $(GIT_SUBMODULES); \
|
||||
echo $$?; \
|
||||
)
|
||||
|
||||
ifeq (1,$(git_module_status))
|
||||
ifeq (no,$(GIT_UPDATE))
|
||||
git-submodule-update:
|
||||
$(call quiet-command, \
|
||||
(cd $(SRC_PATH) && ./scripts/git-submodule.sh update $(GIT_SUBMODULES)), \
|
||||
echo && \
|
||||
echo "GIT submodule checkout is out of date. Please run" && \
|
||||
echo " scripts/git-submodule.sh update $(GIT_SUBMODULES)" && \
|
||||
echo "from the source directory checkout $(SRC_PATH)" && \
|
||||
echo && \
|
||||
exit 1)
|
||||
else
|
||||
git-submodule-update:
|
||||
$(call quiet-command, \
|
||||
(cd $(SRC_PATH) && GIT="$(GIT)" ./scripts/git-submodule.sh update $(GIT_SUBMODULES)), \
|
||||
"GIT","$(GIT_SUBMODULES)")
|
||||
endif
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -267,10 +267,13 @@ stack_protector=""
|
|||
|
||||
if test -e "$source_path/.git"
|
||||
then
|
||||
git_update=yes
|
||||
git_submodules="ui/keycodemapdb"
|
||||
else
|
||||
git_update=no
|
||||
git_submodules=""
|
||||
fi
|
||||
git="git"
|
||||
|
||||
# Don't accept a target_list environment variable.
|
||||
unset target_list
|
||||
|
|
@ -1303,6 +1306,12 @@ for opt do
|
|||
;;
|
||||
--enable-capstone=system) capstone="system"
|
||||
;;
|
||||
--with-git=*) git="$optarg"
|
||||
;;
|
||||
--enable-git-update) git_update=yes
|
||||
;;
|
||||
--disable-git-update) git_update=no
|
||||
;;
|
||||
*)
|
||||
echo "ERROR: unknown option $opt"
|
||||
echo "Try '$0 --help' for more information"
|
||||
|
|
@ -5413,6 +5422,7 @@ echo "local state directory queried at runtime"
|
|||
echo "Windows SDK $win_sdk"
|
||||
fi
|
||||
echo "Source path $source_path"
|
||||
echo "GIT binary $git"
|
||||
echo "GIT submodules $git_submodules"
|
||||
echo "C compiler $cc"
|
||||
echo "Host C compiler $host_cc"
|
||||
|
|
@ -5604,7 +5614,9 @@ echo "extra_cxxflags=$EXTRA_CXXFLAGS" >> $config_host_mak
|
|||
echo "extra_ldflags=$EXTRA_LDFLAGS" >> $config_host_mak
|
||||
echo "qemu_localedir=$qemu_localedir" >> $config_host_mak
|
||||
echo "libs_softmmu=$libs_softmmu" >> $config_host_mak
|
||||
echo "GIT=$git" >> $config_host_mak
|
||||
echo "GIT_SUBMODULES=$git_submodules" >> $config_host_mak
|
||||
echo "GIT_UPDATE=$git_update" >> $config_host_mak
|
||||
|
||||
echo "ARCH=$ARCH" >> $config_host_mak
|
||||
|
||||
|
|
|
|||
|
|
@ -3,21 +3,49 @@
|
|||
# This code is licensed under the GPL version 2 or later. See
|
||||
# the COPYING file in the top-level directory.
|
||||
|
||||
set -e
|
||||
|
||||
substat=".git-submodule-status"
|
||||
|
||||
command=$1
|
||||
shift
|
||||
modules="$@"
|
||||
maybe_modules="$@"
|
||||
|
||||
if test -z "$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
|
||||
}
|
||||
|
||||
modules=""
|
||||
for m in $maybe_modules
|
||||
do
|
||||
$GIT submodule status $m 1> /dev/null 2>&1
|
||||
if test $? = 0
|
||||
then
|
||||
test -e $substat || touch $substat
|
||||
exit 0
|
||||
modules="$modules $m"
|
||||
else
|
||||
echo "warn: ignoring non-existent submodule $m"
|
||||
fi
|
||||
done
|
||||
|
||||
if ! test -e ".git"
|
||||
if test -n "$maybe_modules" && ! test -e ".git"
|
||||
then
|
||||
echo "$0: unexpectedly called with submodules but no git checkout exists"
|
||||
exit 1
|
||||
|
|
@ -25,14 +53,30 @@ fi
|
|||
|
||||
case "$command" in
|
||||
status)
|
||||
if test -z "$maybe_modules"
|
||||
then
|
||||
test -s ${substat} && exit 1 || exit 0
|
||||
fi
|
||||
|
||||
test -f "$substat" || exit 1
|
||||
trap "rm -f ${substat}.tmp" EXIT
|
||||
git submodule status $modules > "${substat}.tmp"
|
||||
diff "${substat}" "${substat}.tmp" >/dev/null
|
||||
CURSTATUS=`$GIT submodule status $modules`
|
||||
OLDSTATUS=`cat $substat`
|
||||
test "$CURSTATUS" = "$OLDSTATUS"
|
||||
exit $?
|
||||
;;
|
||||
update)
|
||||
git submodule update --init $modules 1>/dev/null
|
||||
git submodule status $modules > "${substat}"
|
||||
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 && error "failed to update modules"
|
||||
|
||||
$GIT submodule status $modules > "${substat}"
|
||||
test $? -ne 0 && error "failed to save git submodule status" >&2
|
||||
;;
|
||||
esac
|
||||
|
||||
exit 0
|
||||
|
|
|
|||
Loading…
Reference in New Issue