From a7b344388b51a11cf1c3dd44af4a651b110cf133 Mon Sep 17 00:00:00 2001 From: Danny Al-Gaaf Date: Mon, 2 Mar 2015 16:54:40 +0100 Subject: [PATCH] submodules: --recursive needed for gtest in gmock Signed-off-by: Danny Al-Gaaf --- autogen.sh | 2 +- doc/dev/corpus.rst | 2 +- doc/dev/release-process.rst | 2 +- doc/install/clone-source.rst | 2 +- src/test/docker-test-helper.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/autogen.sh b/autogen.sh index 650993dcf18f..1e06e2687706 100755 --- a/autogen.sh +++ b/autogen.sh @@ -29,7 +29,7 @@ else fi if test -d ".git" ; then - if ! git submodule sync || ! git submodule update --init; then + if ! git submodule sync || ! git submodule update --init --recursive; then echo "Error: could not initialize submodule projects" echo " Network connectivity might be required." exit 1 diff --git a/doc/dev/corpus.rst b/doc/dev/corpus.rst index 70d00fb5ec19..fe8d1e1d6ba2 100644 --- a/doc/dev/corpus.rst +++ b/doc/dev/corpus.rst @@ -24,7 +24,7 @@ We can generate an object corpus for a particular version of ceph like so. git clone ceph.git cd ceph - git submodule update --init + git submodule update --init --recursive #. Build with flag to dump objects to /tmp/foo:: diff --git a/doc/dev/release-process.rst b/doc/dev/release-process.rst index 0471415fc142..f039fd875f47 100644 --- a/doc/dev/release-process.rst +++ b/doc/dev/release-process.rst @@ -43,7 +43,7 @@ In the ceph source directory, checkout next branch (for point releases use the { Checkout the submodules:: - git submodule update --init + git submodule update --init --recursive 4. Update Build version numbers ================================ diff --git a/doc/install/clone-source.rst b/doc/install/clone-source.rst index e4af3e41c411..c7272f252317 100644 --- a/doc/install/clone-source.rst +++ b/doc/install/clone-source.rst @@ -83,7 +83,7 @@ repository. If your submodules are out of date, run:: - git submodule update + git submodule update --init --recursive Choose a Branch =============== diff --git a/src/test/docker-test-helper.sh b/src/test/docker-test-helper.sh index c2b3cdb507d2..048b8b405c04 100755 --- a/src/test/docker-test-helper.sh +++ b/src/test/docker-test-helper.sh @@ -96,7 +96,7 @@ function setup_downstream() { cd $downstream git reset --hard $ref || return 1 git submodule sync || return 1 - git submodule update --init || return 1 + git submodule update --init --recursive || return 1 ) } -- 2.47.3