From eb6995436f9db1f0da17d71aa08ffefa6a358152 Mon Sep 17 00:00:00 2001 From: Rishabh Dave Date: Thu, 26 Oct 2023 16:18:31 +0530 Subject: [PATCH] cmake: add --progress flag to git submodule update commands Ceph has lots of submodules that needs to be cloned before building binaries from the repository. Seeing the progress when these submodules are being cloned is useful, especially when developers/users have a network issue or a slow network. Signed-off-by: Rishabh Dave --- README.md | 2 +- do_cmake.sh | 2 +- doc/dev/corpus.rst | 2 +- doc/install/clone-source.rst | 4 ++-- make-dist | 2 +- qa/workunits/rados/test_envlibrados_for_rocksdb.sh | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 9db4161c793d0..3a0274b537563 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ following commands to move into the cloned `ceph/ceph` repository and to check out the git submodules associated with it: cd ceph - git submodule update --init --recursive + git submodule update --init --recursive --progress ## Build Prerequisites diff --git a/do_cmake.sh b/do_cmake.sh index 6936a5596ebd0..e838bca8b9762 100755 --- a/do_cmake.sh +++ b/do_cmake.sh @@ -2,7 +2,7 @@ set -ex if [ -d .git ]; then - git submodule update --init --recursive + git submodule update --init --recursive --progress fi : ${BUILD_DIR:=build} diff --git a/doc/dev/corpus.rst b/doc/dev/corpus.rst index 4005f70c0384c..85cfc0ef2c905 100644 --- a/doc/dev/corpus.rst +++ b/doc/dev/corpus.rst @@ -27,7 +27,7 @@ script of ``script/gen-corpus.sh``, or by following the instructions below: git clone ceph.git cd ceph - git submodule update --init --recursive + git submodule update --init --recursive --progress #. Build with flag to dump objects to ``/tmp/foo``:: diff --git a/doc/install/clone-source.rst b/doc/install/clone-source.rst index 2d09ef9ebabe3..8e783fed8e836 100644 --- a/doc/install/clone-source.rst +++ b/doc/install/clone-source.rst @@ -154,13 +154,13 @@ Updating Submodules .. prompt:: bash $ - git submodule update --force --init --recursive + git submodule update --force --init --recursive --progress git clean -fdx git submodule foreach git clean -fdx If you still have problems with a submodule directory, use ``rm -rf [directory name]`` to remove the directory. Then run ``git submodule update - --init --recursive`` again. + --init --recursive --progress`` again. #. Run ``git status`` again: diff --git a/make-dist b/make-dist index f69a969ada0c6..4add880180eb5 100755 --- a/make-dist +++ b/make-dist @@ -35,7 +35,7 @@ echo "version $version" # update submodules echo "updating submodules..." force=$(if git submodule usage 2>&1 | grep --quiet 'update.*--force'; then echo --force ; fi) -if ! git submodule sync || ! git submodule update $force --init --recursive; then +if ! git submodule sync || ! git submodule update $force --init --recursive --progress; then echo "Error: could not initialize submodule projects" echo " Network connectivity might be required." exit 1 diff --git a/qa/workunits/rados/test_envlibrados_for_rocksdb.sh b/qa/workunits/rados/test_envlibrados_for_rocksdb.sh index 371452f404292..ccabbd8a6a6c6 100755 --- a/qa/workunits/rados/test_envlibrados_for_rocksdb.sh +++ b/qa/workunits/rados/test_envlibrados_for_rocksdb.sh @@ -58,7 +58,7 @@ if [ -e rocksdb ]; then fi pushd $(dirname /home/ubuntu/cephtest/clone.client.0/qa/workunits/rados/bash.sh)/../../../ -git submodule update --init src/rocksdb +git submodule update --init --progress src/rocksdb popd git clone $(dirname /home/ubuntu/cephtest/clone.client.0/qa/workunits/rados/bash.sh)/../../../src/rocksdb rocksdb -- 2.39.5