From: Loic Dachary <ldachary@redhat.com>
Date: Thu, 5 Mar 2015 21:17:33 +0000 (+0100)
Subject: Revert "build: use 'git submodule deinit' instead of 'rm -rf'"
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=594ab828cede75a133993ab95922d5c01eb5fbe2;p=autobuild-ceph.git

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 f75f803..2f74407 100755
--- 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 95814af..4d3b7f8 100755
--- 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 a30fa33..bfad541 100755
--- 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 013dcb7..56909bd 100755
--- 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 acda681..5e67e27 100755
--- 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 f289952..d6bd7fc 100755
--- 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