From eb3df51aea93bd87d8ae883e7f4dba14d0040e3d Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sun, 22 Aug 2021 23:01:46 +0800 Subject: [PATCH] ceph*-buiild/build/setup_deb: create tmp dir in setup_rpm_build_deps() better maintainability this way. Signed-off-by: Kefu Chai --- ceph-build/build/setup_deb | 3 --- ceph-build/build/setup_rpm | 3 --- ceph-dev-build/build/setup_deb | 3 --- ceph-dev-build/build/setup_rpm | 3 --- ceph-dev-new-build/build/setup_deb | 3 --- ceph-dev-new-build/build/setup_rpm | 3 --- scripts/build_utils.sh | 4 ++++ 7 files changed, 4 insertions(+), 18 deletions(-) diff --git a/ceph-build/build/setup_deb b/ceph-build/build/setup_deb index 7671de16..e91ed75c 100644 --- 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 6bcbbf95..4a8d91b3 100644 --- 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 4a92a1b7..5d2481c1 100644 --- 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 be71f142..74f4e365 100644 --- 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 4a92a1b7..5d2481c1 100644 --- 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 49338cff..776f52f4 100644 --- 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 3512c85c..cb086a45 100644 --- 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) -- 2.47.3