ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: log submodule update from git-submodule.sh 

Print exactly which submodules have been updated, by reusing the logic of
"git-submodule.sh validate" after executing "git submodule update --init'.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2023-05-30 17:27:48 +02:00
parent fdb8fd8cb9
commit d120116b5d
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -52,9 +52,7 @@ Makefile: .git-submodule-status
.PHONY: git-submodule-update .PHONY: git-submodule-update
git-submodule-update: git-submodule-update:
ifneq ($(GIT_SUBMODULES_ACTION),ignore) ifneq ($(GIT_SUBMODULES_ACTION),ignore)
$(call quiet-command, \ $(quiet-@)GIT=git "$(SRC_PATH)/scripts/git-submodule.sh" $(GIT_SUBMODULES_ACTION) $(GIT_SUBMODULES)
(GIT=git "$(SRC_PATH)/scripts/git-submodule.sh" $(GIT_SUBMODULES_ACTION) $(GIT_SUBMODULES)), \
"GIT","$(GIT_SUBMODULES)")
endif endif
# 0. ensure the build tree is okay # 0. ensure the build tree is okay

16
scripts/git-submodule.sh
View File

@ -46,6 +46,13 @@ validate_error() {
exit 1 exit 1
} }
check_updated() {
local CURSTATUS OLDSTATUS
CURSTATUS=$($GIT submodule status $module)
OLDSTATUS=$(grep $module $substat)
test "$CURSTATUS" = "$OLDSTATUS"
}
if test -n "$maybe_modules" && ! test -e ".git" if test -n "$maybe_modules" && ! test -e ".git"
then then
echo "$0: unexpectedly called with submodules but no git checkout exists" echo "$0: unexpectedly called with submodules but no git checkout exists"
@ -75,11 +82,7 @@ status|validate)
test -f "$substat" || validate_error "$command" test -f "$substat" || validate_error "$command"
test -z "$maybe_modules" && exit 0 test -z "$maybe_modules" && exit 0
for module in $modules; do for module in $modules; do
CURSTATUS=$($GIT submodule status $module) check_updated $module || validate_error "$command"
OLDSTATUS=$(cat $substat | grep $module)
if test "$CURSTATUS" != "$OLDSTATUS"; then
validate_error "$command"
fi
done done
exit 0 exit 0
;; ;;
@ -89,6 +92,9 @@ update)
$GIT submodule update --init $modules 1>/dev/null $GIT submodule update --init $modules 1>/dev/null
test $? -ne 0 && update_error "failed to update modules" test $? -ne 0 && update_error "failed to update modules"
for module in $modules; do
check_updated $module || echo Updated "$module"
done
(while read -r; do (while read -r; do
for module in $modules; do for module in $modules; do