From fdf7123511003497a89d3acd2195b91cb737f703 Mon Sep 17 00:00:00 2001 From: Boris Ranto Date: Wed, 20 May 2015 11:53:00 +0200 Subject: [PATCH] Move the installation to a better place and cond-require it on install-deps.sh executability --- build-ceph-deb-native.sh | 4 +--- build-ceph-deb.sh | 4 +--- build-ceph-gcov.sh | 4 +--- build-ceph-notcmalloc.sh | 4 +--- build-ceph-rpm.sh | 4 +--- build-ceph.sh | 4 +--- 6 files changed, 6 insertions(+), 18 deletions(-) diff --git a/build-ceph-deb-native.sh b/build-ceph-deb-native.sh index cbcf9b8..59ba97b 100755 --- a/build-ceph-deb-native.sh +++ b/build-ceph-deb-native.sh @@ -22,6 +22,7 @@ git clean -fdx DIST=`lsb_release -sc` echo --START-IGNORE-WARNINGS +[ ! -x install-deps.sh ] || ./install-deps.sh [ ! -x autogen.sh ] || ./autogen.sh || exit 1 autoconf || true echo --STOP-IGNORE-WARNINGS @@ -35,9 +36,6 @@ fi # Actually build the project -# Install build-time dependencies -./install-deps.sh - # clear out any $@ potentially passed in set -- diff --git a/build-ceph-deb.sh b/build-ceph-deb.sh index 595cf5d..146b0b3 100755 --- a/build-ceph-deb.sh +++ b/build-ceph-deb.sh @@ -23,6 +23,7 @@ git clean -fdx DISTS=`cat ../../dists` echo --START-IGNORE-WARNINGS +[ ! -x install-deps.sh ] || ./install-deps.sh [ ! -x autogen.sh ] || ./autogen.sh || exit 1 autoconf || true echo --STOP-IGNORE-WARNINGS @@ -36,9 +37,6 @@ fi # Actually build the project -# Install build-time dependencies -./install-deps.sh - # clear out any $@ potentially passed in set -- diff --git a/build-ceph-gcov.sh b/build-ceph-gcov.sh index 9be57d3..31ccf8a 100755 --- a/build-ceph-gcov.sh +++ b/build-ceph-gcov.sh @@ -21,6 +21,7 @@ git clean -fdx && git reset --hard git clean -fdx echo --START-IGNORE-WARNINGS +[ ! -x install-deps.sh ] || ./install-deps.sh [ ! -x autogen.sh ] || ./autogen.sh || exit 1 autoconf || true echo --STOP-IGNORE-WARNINGS @@ -34,9 +35,6 @@ fi # Actually build the project -# Install build-time dependencies -./install-deps.sh - # clear out any $@ potentially passed in set -- diff --git a/build-ceph-notcmalloc.sh b/build-ceph-notcmalloc.sh index c21d513..049720e 100755 --- a/build-ceph-notcmalloc.sh +++ b/build-ceph-notcmalloc.sh @@ -22,6 +22,7 @@ git clean -fdx echo --START-IGNORE-WARNINGS +[ ! -x install-deps.sh ] || ./install-deps.sh [ ! -x autogen.sh ] || ./autogen.sh || exit 1 autoconf || true echo --STOP-IGNORE-WARNINGS @@ -35,9 +36,6 @@ fi # Actually build the project -# Install build-time dependencies -./install-deps.sh - # clear out any $@ potentially passed in set -- diff --git a/build-ceph-rpm.sh b/build-ceph-rpm.sh index d1582cd..36991a3 100755 --- a/build-ceph-rpm.sh +++ b/build-ceph-rpm.sh @@ -47,6 +47,7 @@ then fi echo --START-IGNORE-WARNINGS +[ ! -x install-deps.sh ] || ./install-deps.sh [ ! -x autogen.sh ] || ./autogen.sh || exit 1 autoconf || true echo --STOP-IGNORE-WARNINGS @@ -61,9 +62,6 @@ fi # Actually build the project -# Install build-time dependencies -./install-deps.sh - # clear out any $@ potentially passed in set -- diff --git a/build-ceph.sh b/build-ceph.sh index 0e846d8..e6a7f44 100755 --- a/build-ceph.sh +++ b/build-ceph.sh @@ -20,6 +20,7 @@ git clean -fdx && git reset --hard git clean -fdx echo --START-IGNORE-WARNINGS +[ ! -x install-deps.sh ] || ./install-deps.sh [ ! -x autogen.sh ] || ./autogen.sh || exit 1 autoconf || true echo --STOP-IGNORE-WARNINGS @@ -33,9 +34,6 @@ fi # Actually build the project -# Install build-time dependencies -./install-deps.sh - # clear out any $@ potentially passed in set -- -- 2.39.5