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 <ridave@redhat.com>

diff --git a/README.md b/README.md
index 9db4161c793d00fdd6746f06971ffdac6300f3b5..3a0274b537563ab32dc1ce71a92ab9dccd686642 100644 (file)
--- 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 6936a5596ebd090f06cf7999e34f35c07517feb8..e838bca8b9762c5cc77bba6da5ccc43d40fba994 100755 (executable)
--- 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 4005f70c0384ca1506c23afada54ce05c36eb4cd..85cfc0ef2c9059a305ce60f70edbb18c4c5b15d0 100644 (file)
--- 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 2d09ef9ebabe3add55e50e10a311b0ea22781686..8e783fed8e836d69af3a1b15230c686729b4df7f 100644 (file)
--- 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 f69a969ada0c65745e00ededbea36e71e6feec96..4add880180eb5abb5a62b783be18d5d44311b133 100755 (executable)
--- 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 371452f404292b1c05f779613c0e44c4f87371b2..ccabbd8a6a6c6e24f57ee5f31f34e7ad64d5c07a 100755 (executable)
--- 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