From a4323ad08fb909bf216fc3ebe0a25cc67d4c0a6c Mon Sep 17 00:00:00 2001 From: Danny Al-Gaaf Date: Thu, 5 Mar 2015 17:24:29 +0100 Subject: [PATCH] build: use 'git submodule deinit' instead of 'rm -rf' Fix submodule handling: deinit submodules instead of removing them and call update with --recursive, needed to checkout gtest within gmock. Signed-off-by: Danny Al-Gaaf --- build-ceph-deb-native.sh | 14 ++------------ build-ceph-deb.sh | 14 ++------------ build-ceph-gcov.sh | 14 ++------------ build-ceph-notcmalloc.sh | 14 ++------------ build-ceph-rpm.sh | 14 ++------------ build-ceph.sh | 14 ++------------ 6 files changed, 12 insertions(+), 72 deletions(-) diff --git a/build-ceph-deb-native.sh b/build-ceph-deb-native.sh index 2f74407..f75f803 100755 --- a/build-ceph-deb-native.sh +++ b/build-ceph-deb-native.sh @@ -2,21 +2,11 @@ set -e git clean -fdx && git reset --hard -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 +git submodule deinit -f . rm -rf .git/modules/ /srv/git/bin/git submodule sync /srv/autobuild-ceph/use-mirror.sh -/srv/git/bin/git submodule update --init +/srv/git/bin/git submodule update --init --recursive git clean -fdx DIST=`lsb_release -sc` diff --git a/build-ceph-deb.sh b/build-ceph-deb.sh index 4d3b7f8..95814af 100755 --- a/build-ceph-deb.sh +++ b/build-ceph-deb.sh @@ -2,21 +2,11 @@ set -e git clean -fdx && git reset --hard -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 +git submodule deinit -f . rm -rf .git/modules/ /srv/git/bin/git submodule sync /srv/autobuild-ceph/use-mirror.sh -/srv/git/bin/git submodule update --init +/srv/git/bin/git submodule update --init --recursive git clean -fdx diff --git a/build-ceph-gcov.sh b/build-ceph-gcov.sh index bfad541..a30fa33 100755 --- a/build-ceph-gcov.sh +++ b/build-ceph-gcov.sh @@ -3,21 +3,11 @@ set -e git clean -fdx && git reset --hard -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 +git submodule deinit -f . rm -rf .git/modules/ /srv/git/bin/git submodule sync /srv/autobuild-ceph/use-mirror.sh -/srv/git/bin/git submodule update --init +/srv/git/bin/git submodule update --init --recursive git clean -fdx echo --START-IGNORE-WARNINGS diff --git a/build-ceph-notcmalloc.sh b/build-ceph-notcmalloc.sh index 56909bd..013dcb7 100755 --- a/build-ceph-notcmalloc.sh +++ b/build-ceph-notcmalloc.sh @@ -3,21 +3,11 @@ set -e git clean -fdx && git reset --hard -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 +git submodule deinit -f . rm -rf .git/modules/ /srv/git/bin/git submodule sync /srv/autobuild-ceph/use-mirror.sh -/srv/git/bin/git submodule update --init +/srv/git/bin/git submodule update --init --recursive git clean -fdx diff --git a/build-ceph-rpm.sh b/build-ceph-rpm.sh index 5e67e27..acda681 100755 --- a/build-ceph-rpm.sh +++ b/build-ceph-rpm.sh @@ -2,21 +2,11 @@ set -e git clean -fdx && git reset --hard -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 +git submodule deinit -f . rm -rf .git/modules/ /srv/git/bin/git submodule sync /srv/autobuild-ceph/use-mirror.sh -/srv/git/bin/git submodule update --init +/srv/git/bin/git submodule update --init --recursive git clean -fdx DISTS=`cat ../../dists` diff --git a/build-ceph.sh b/build-ceph.sh index d6bd7fc..f289952 100755 --- a/build-ceph.sh +++ b/build-ceph.sh @@ -2,21 +2,11 @@ set -e git clean -fdx && git reset --hard -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 +git submodule deinit -f . rm -rf .git/modules/ /srv/git/bin/git submodule sync /srv/autobuild-ceph/use-mirror.sh -/srv/git/bin/git submodule update --init +/srv/git/bin/git submodule update --init --recursive git clean -fdx echo --START-IGNORE-WARNINGS -- 2.39.5