Revert "build: use 'git submodule deinit' instead of 'rm -rf'"

This reverts commit a4323ad08fb909bf216fc3ebe0a25cc67d4c0a6c.

diff --git a/build-ceph-deb-native.sh b/build-ceph-deb-native.sh
index f75f803f42922f8c99e0c9cbbb0bc196e958c3ef..2f74407ff3e55bb5afee6d73ccf9ddd031561ba5 100755 (executable)
--- a/build-ceph-deb-native.sh
+++ b/build-ceph-deb-native.sh
@@ -2,11 +2,21 @@
 set -e
 
 git clean -fdx && git reset --hard
-git submodule deinit -f .
+git submodule foreach 'git clean -fdx && git reset --hard'
+rm -rf ceph-object-corpus
+rm -rf ceph-erasure-code-corpus
+rm -rf src/gmock
+rm -rf src/leveldb
+rm -rf src/libs3
+rm -rf src/mongoose
+rm -rf src/civetweb
+rm -rf src/rocksdb
+rm -rf src/erasure-code/jerasure/gf-complete
+rm -rf src/erasure-code/jerasure/jerasure
 rm -rf .git/modules/
 /srv/git/bin/git submodule sync
 /srv/autobuild-ceph/use-mirror.sh
-/srv/git/bin/git submodule update --init --recursive
+/srv/git/bin/git submodule update --init
 git clean -fdx
 
 DIST=`lsb_release -sc`

diff --git a/build-ceph-deb.sh b/build-ceph-deb.sh
index 95814aff97dd46b8d49293a3a10be4251a7b4dbc..4d3b7f81e6da74f828c9b6bfb10c418e45451088 100755 (executable)
--- a/build-ceph-deb.sh
+++ b/build-ceph-deb.sh
@@ -2,11 +2,21 @@
 set -e
 
 git clean -fdx && git reset --hard
-git submodule deinit -f .
+git submodule foreach 'git clean -fdx && git reset --hard'
+rm -rf ceph-object-corpus
+rm -rf ceph-erasure-code-corpus
+rm -rf src/gmock
+rm -rf src/leveldb
+rm -rf src/libs3
+rm -rf src/mongoose
+rm -rf src/civetweb
+rm -rf src/rocksdb
+rm -rf src/erasure-code/jerasure/gf-complete
+rm -rf src/erasure-code/jerasure/jerasure
 rm -rf .git/modules/
 /srv/git/bin/git submodule sync
 /srv/autobuild-ceph/use-mirror.sh
-/srv/git/bin/git submodule update --init --recursive
+/srv/git/bin/git submodule update --init
 git clean -fdx
 
 

diff --git a/build-ceph-gcov.sh b/build-ceph-gcov.sh
index a30fa33ad77cd1f2c7c8dde03d1c85c802b81d1f..bfad54111106f63181d1262301462d2259cd9bc3 100755 (executable)
--- a/build-ceph-gcov.sh
+++ b/build-ceph-gcov.sh
@@ -3,11 +3,21 @@ set -e
 
 
 git clean -fdx && git reset --hard
-git submodule deinit -f .
+git submodule foreach 'git clean -fdx && git reset --hard'
+rm -rf ceph-object-corpus
+rm -rf ceph-erasure-code-corpus
+rm -rf src/gmock
+rm -rf src/leveldb
+rm -rf src/libs3
+rm -rf src/mongoose
+rm -rf src/civetweb
+rm -rf src/rocksdb
+rm -rf src/erasure-code/jerasure/gf-complete
+rm -rf src/erasure-code/jerasure/jerasure
 rm -rf .git/modules/
 /srv/git/bin/git submodule sync
 /srv/autobuild-ceph/use-mirror.sh
-/srv/git/bin/git submodule update --init --recursive
+/srv/git/bin/git submodule update --init
 git clean -fdx
 
 echo --START-IGNORE-WARNINGS

diff --git a/build-ceph-notcmalloc.sh b/build-ceph-notcmalloc.sh
index 013dcb7a8ecb5f37856f9b9db8d22ae5dc2220df..56909bd3c038b30040a5f52805fb07b2f572aef3 100755 (executable)
--- a/build-ceph-notcmalloc.sh
+++ b/build-ceph-notcmalloc.sh
@@ -3,11 +3,21 @@ set -e
 
 
 git clean -fdx && git reset --hard
-git submodule deinit -f .
+git submodule foreach 'git clean -fdx && git reset --hard'
+rm -rf ceph-object-corpus
+rm -rf ceph-erasure-code-corpus
+rm -rf src/gmock
+rm -rf src/leveldb
+rm -rf src/libs3
+rm -rf src/mongoose
+rm -rf src/civetweb
+rm -rf src/rocksdb
+rm -rf src/erasure-code/jerasure/gf-complete
+rm -rf src/erasure-code/jerasure/jerasure
 rm -rf .git/modules/
 /srv/git/bin/git submodule sync
 /srv/autobuild-ceph/use-mirror.sh
-/srv/git/bin/git submodule update --init --recursive
+/srv/git/bin/git submodule update --init
 git clean -fdx
 
 

diff --git a/build-ceph-rpm.sh b/build-ceph-rpm.sh
index acda681d8b25326dfb38431c829b1b9bcc7179b2..5e67e27ff8f3273c54fc610e35a8565d1e3649cc 100755 (executable)
--- a/build-ceph-rpm.sh
+++ b/build-ceph-rpm.sh
@@ -2,11 +2,21 @@
 set -e
 
 git clean -fdx && git reset --hard
-git submodule deinit -f .
+git submodule foreach 'git clean -fdx && git reset --hard'
+rm -rf ceph-object-corpus
+rm -rf ceph-erasure-code-corpus
+rm -rf src/gmock
+rm -rf src/leveldb
+rm -rf src/libs3
+rm -rf src/mongoose
+rm -rf src/civetweb
+rm -rf src/rocksdb
+rm -rf src/erasure-code/jerasure/gf-complete
+rm -rf src/erasure-code/jerasure/jerasure
 rm -rf .git/modules/
 /srv/git/bin/git submodule sync
 /srv/autobuild-ceph/use-mirror.sh
-/srv/git/bin/git submodule update --init --recursive
+/srv/git/bin/git submodule update --init
 git clean -fdx
 
 DISTS=`cat ../../dists`

diff --git a/build-ceph.sh b/build-ceph.sh
index f289952e57789ddeaae667965e159c6e54c383bd..d6bd7fc3103a34ac9963401ceba597bb930aae38 100755 (executable)
--- a/build-ceph.sh
+++ b/build-ceph.sh
@@ -2,11 +2,21 @@
 set -e
 
 git clean -fdx && git reset --hard
-git submodule deinit -f .
+git submodule foreach 'git clean -fdx && git reset --hard'
+rm -rf ceph-object-corpus
+rm -rf ceph-erasure-code-corpus
+rm -rf src/gmock
+rm -rf src/leveldb
+rm -rf src/libs3
+rm -rf src/mongoose
+rm -rf src/civetweb
+rm -rf src/rocksdb
+rm -rf src/erasure-code/jerasure/gf-complete
+rm -rf src/erasure-code/jerasure/jerasure
 rm -rf .git/modules/
 /srv/git/bin/git submodule sync
 /srv/autobuild-ceph/use-mirror.sh
-/srv/git/bin/git submodule update --init --recursive
+/srv/git/bin/git submodule update --init
 git clean -fdx
 
 echo --START-IGNORE-WARNINGS