ceph*-buiild/build/setup_deb: create tmp dir in setup_rpm_build_deps()

better maintainability this way.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>

diff --git a/ceph-build/build/setup_deb b/ceph-build/build/setup_deb
index 7671de16838b48009c4e8748f610dddf25dd7c65..e91ed75c02cda0ed3b8784eec1416a1cbc22854c 100644 (file)
--- a/ceph-build/build/setup_deb
+++ b/ceph-build/build/setup_deb
@@ -13,9 +13,6 @@ echo "*****"
 env
 echo "*****"
 
-DIR=/tmp/install-deps.$$
-trap "rm -fr $DIR" EXIT
-mkdir -p $DIR
 if test $(id -u) != 0 ; then
     SUDO=sudo
 fi

diff --git a/ceph-build/build/setup_rpm b/ceph-build/build/setup_rpm
index 6bcbbf95326aa9d8cc047bfaf9cea386b95e1735..4a8d91b3e3bec5c5bc1951d1cecb87daf3c78f22 100644 (file)
--- a/ceph-build/build/setup_rpm
+++ b/ceph-build/build/setup_rpm
@@ -13,9 +13,6 @@ echo "*****"
 env
 echo "*****"
 
-DIR=/tmp/install-deps.$$
-trap "rm -fr $DIR" EXIT
-mkdir -p $DIR
 if test $(id -u) != 0 ; then
     SUDO=sudo
 fi

diff --git a/ceph-dev-build/build/setup_deb b/ceph-dev-build/build/setup_deb
index 4a92a1b7da469ef2e76e5d9ebab1a7c5d1b4a917..5d2481c1984301a73958fe6746bc462048c1c1dc 100644 (file)
--- a/ceph-dev-build/build/setup_deb
+++ b/ceph-dev-build/build/setup_deb
@@ -13,9 +13,6 @@ echo "*****"
 env
 echo "*****"
 
-DIR=/tmp/install-deps.$$
-trap "rm -fr $DIR" EXIT
-mkdir -p $DIR
 if test $(id -u) != 0 ; then
     SUDO=sudo
 fi

diff --git a/ceph-dev-build/build/setup_rpm b/ceph-dev-build/build/setup_rpm
index be71f14202c61cfb50050ef08ad55ef2143c5594..74f4e3656c229e5deb321fe446b9b0f854a7ad79 100644 (file)
--- a/ceph-dev-build/build/setup_rpm
+++ b/ceph-dev-build/build/setup_rpm
@@ -13,9 +13,6 @@ echo "*****"
 env
 echo "*****"
 
-DIR=/tmp/install-deps.$$
-trap "rm -fr $DIR" EXIT
-mkdir -p $DIR
 if test $(id -u) != 0 ; then
     SUDO=sudo
 fi

diff --git a/ceph-dev-new-build/build/setup_deb b/ceph-dev-new-build/build/setup_deb
index 4a92a1b7da469ef2e76e5d9ebab1a7c5d1b4a917..5d2481c1984301a73958fe6746bc462048c1c1dc 100644 (file)
--- a/ceph-dev-new-build/build/setup_deb
+++ b/ceph-dev-new-build/build/setup_deb
@@ -13,9 +13,6 @@ echo "*****"
 env
 echo "*****"
 
-DIR=/tmp/install-deps.$$
-trap "rm -fr $DIR" EXIT
-mkdir -p $DIR
 if test $(id -u) != 0 ; then
     SUDO=sudo
 fi

diff --git a/ceph-dev-new-build/build/setup_rpm b/ceph-dev-new-build/build/setup_rpm
index 49338cffbb5640ba9c711773ea6f55425fabb46f..776f52f4df93ac2e788ca6e01bdd1f0e70ac7029 100644 (file)
--- a/ceph-dev-new-build/build/setup_rpm
+++ b/ceph-dev-new-build/build/setup_rpm
@@ -13,9 +13,6 @@ echo "*****"
 env
 echo "*****"
 
-DIR=/tmp/install-deps.$$
-trap "rm -fr $DIR" EXIT
-mkdir -p $DIR
 if test $(id -u) != 0 ; then
     SUDO=sudo
 fi

diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh
index 3512c85c6dc4cf6ae6b1e269bbb95f2a13ddd59f..cb086a45cbc4540eddbd27ff44e6a2cc02b26427 100644 (file)
--- a/scripts/build_utils.sh
+++ b/scripts/build_utils.sh
@@ -1415,6 +1415,10 @@ setup_rpm_build_deps() {
        $SUDO dnf config-manager --add-repo="https://apache.jfrog.io/artifactory/arrow/centos/${RELEASE}/x86_64"
     fi
 
+    DIR=/tmp/install-deps.$$
+    trap "rm -fr $DIR" EXIT
+    mkdir -p $DIR
+
     sed -e 's/@//g' < ceph.spec.in > $DIR/ceph.spec
 
     # enable more build depends required by build flavor(jaeger, crimson)