From: Kefu Chai <kchai@redhat.com>
Date: Wed, 22 Jan 2020 15:10:34 +0000 (+0800)
Subject: ceph-*-setup: do not run install-deps.sh
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=793d8c721d981d5cb0c8d0e5040ab807e19fdfd5;p=ceph-build.git

ceph-*-setup: do not run install-deps.sh

this is a follow-up change of #1487. since we don't use autotools for
preparing dist tarball, there is no need to run install-deps.sh for
installing the autotools.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/ceph-dev-new-setup/build/build b/ceph-dev-new-setup/build/build
index 94a98a30..30de0dcc 100644
--- a/ceph-dev-new-setup/build/build
+++ b/ceph-dev-new-setup/build/build
@@ -64,14 +64,6 @@ else
     echo "forcing."
 fi
 
-# because autogen+configure will check for dependencies, we are forced to install them
-# and ensure they are present in the current host
-if [ -x install-deps.sh ]; then
-    echo "Ensuring dependencies are installed"
-    [ "${FLAVOR}" == "crimson" ] && WITH_SEASTAR=1
-    WITH_SEASTAR=$WITH_SEASTAR ./install-deps.sh
-fi
-
 # Flavor Builds support
 
 case "${FLAVOR}" in
diff --git a/ceph-dev-setup/build/build b/ceph-dev-setup/build/build
index 5a125cba..b7a3b82b 100644
--- a/ceph-dev-setup/build/build
+++ b/ceph-dev-setup/build/build
@@ -32,13 +32,6 @@ rm -rf release
 #sed -i 's/^Source0:.*/Source0:        http:\/\/ceph.com\/download\/%{name}-%{version}-rc1.tar.bz2/' ceph.spec.in
 #sed -i 's/^%setup.*/%setup -q -n %{name}-%{version}-rc1/' ceph.spec.in
 
-# because autogen+configure will check for dependencies, we are forced to install them
-# and ensure they are present in the current host
-if [ -x install-deps.sh ]; then
-  echo "Ensuring dependencies are installed"
-  ./install-deps.sh
-fi
-
 # run submodule updates regardless
 echo "Running submodule update ..."
 git submodule update --init
diff --git a/ceph-setup/build/build b/ceph-setup/build/build
index 6dce67f2..61b437b0 100644
--- a/ceph-setup/build/build
+++ b/ceph-setup/build/build
@@ -27,13 +27,6 @@ rm -rf release
 #sed -i 's/^Source0:.*/Source0:        http:\/\/ceph.com\/download\/%{name}-%{version}-rc1.tar.bz2/' ceph.spec.in
 #sed -i 's/^%setup.*/%setup -q -n %{name}-%{version}-rc1/' ceph.spec.in
 
-# because autogen+configure will check for dependencies, we are forced to install them
-# and ensure they are present in the current host
-if [ -x install-deps.sh ]; then
-  echo "Ensuring dependencies are installed"
-  ./install-deps.sh
-fi
-
 # run submodule updates regardless
 echo "Running submodule update ..."
 git submodule update --init