[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 04/10] build: log submodule update from git-submodule.sh
From: |
Paolo Bonzini |
Subject: |
[PATCH 04/10] build: log submodule update from git-submodule.sh |
Date: |
Mon, 5 Jun 2023 11:52:17 +0200 |
Print exactly which submodules have been updated, by reusing the logic of
"git-submodule.sh validate" after executing "git submodule update --init'.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 4 +---
scripts/git-submodule.sh | 16 +++++++++++-----
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index 8005f1cc53e..d68196acb9e 100644
--- a/Makefile
+++ b/Makefile
@@ -52,9 +52,7 @@ Makefile: .git-submodule-status
.PHONY: git-submodule-update
git-submodule-update:
ifneq ($(GIT_SUBMODULES_ACTION),ignore)
- $(call quiet-command, \
- (GIT=git "$(SRC_PATH)/scripts/git-submodule.sh"
$(GIT_SUBMODULES_ACTION) $(GIT_SUBMODULES)), \
- "GIT","$(GIT_SUBMODULES)")
+ $(quiet-@)GIT=git "$(SRC_PATH)/scripts/git-submodule.sh"
$(GIT_SUBMODULES_ACTION) $(GIT_SUBMODULES)
endif
# 0. ensure the build tree is okay
diff --git a/scripts/git-submodule.sh b/scripts/git-submodule.sh
index b7d8f05352c..38b55c90e11 100755
--- a/scripts/git-submodule.sh
+++ b/scripts/git-submodule.sh
@@ -46,6 +46,13 @@ validate_error() {
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"
then
echo "$0: unexpectedly called with submodules but no git checkout exists"
@@ -75,11 +82,7 @@ status|validate)
test -f "$substat" || validate_error "$command"
test -z "$maybe_modules" && exit 0
for module in $modules; do
- CURSTATUS=$($GIT submodule status $module)
- OLDSTATUS=$(cat $substat | grep $module)
- if test "$CURSTATUS" != "$OLDSTATUS"; then
- validate_error "$command"
- fi
+ check_updated $module || validate_error "$command"
done
exit 0
;;
@@ -89,6 +92,9 @@ update)
$GIT submodule update --init $modules 1>/dev/null
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
for module in $modules; do
--
2.40.1
- [PATCH v2 00/10] meson: replace submodules with wrap files, Paolo Bonzini, 2023/06/05
- [PATCH 02/10] configure: rename --enable-pypi to --enable-download, control subprojects too, Paolo Bonzini, 2023/06/05
- [PATCH 03/10] git-submodule: allow partial update of .git-submodule-status, Paolo Bonzini, 2023/06/05
- [PATCH 01/10] configure: remove --with-git= option, Paolo Bonzini, 2023/06/05
- [PATCH 04/10] build: log submodule update from git-submodule.sh,
Paolo Bonzini <=
- [PATCH 07/10] pc-bios/s390-ccw: always build network bootloader, Paolo Bonzini, 2023/06/05
- [PATCH 06/10] configure: move SLOF submodule handling to pc-bios/s390-ccw, Paolo Bonzini, 2023/06/05