]> git.apps.os.sepia.ceph.com Git - ceph-build.git/commitdiff
ceph-*-setup: do not run install-deps.sh 1488/head
authorKefu Chai <kchai@redhat.com>
Wed, 22 Jan 2020 15:10:34 +0000 (23:10 +0800)
committerKefu Chai <kchai@redhat.com>
Wed, 22 Jan 2020 15:10:35 +0000 (23:10 +0800)
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>
ceph-dev-new-setup/build/build
ceph-dev-setup/build/build
ceph-setup/build/build

index 94a98a30a0d69d935ad88c3713a7224b22c7ab9f..30de0dcc369b8a3e04ff0f37b9dde5f9e919e1c5 100644 (file)
@@ -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
index 5a125cba77d37faffec775e3ae8a73f9e5a173a0..b7a3b82b1329f6cdc6f9dbd4783d2cdf11a00a54 100644 (file)
@@ -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
index 6dce67f2bd12b816a9991d9354c1afeb179357d7..61b437b0db764a83354700eba319e43bed4f8e7b 100644 (file)
@@ -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