From: Alfredo Deza <adeza@redhat.com>
Date: Thu, 4 Jun 2015 15:12:58 +0000 (-0400)
Subject: remove the need for bindir to build rpms
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cdcf1bf50e4b0fefa91cbf9e4e7db2cdda07df38;p=ceph-build.git

remove the need for bindir to build rpms

Signed-off-by: Alfredo Deza <adeza@redhat.com>
---

diff --git a/ceph-build/build/build_rpm b/ceph-build/build/build_rpm
index c1d6c4ef..e1c3f3ec 100644
--- a/ceph-build/build/build_rpm
+++ b/ceph-build/build/build_rpm
@@ -12,11 +12,6 @@ echo "*****"
 env
 echo "*****"
 
-if [ ! -d /srv/ceph-build ] ; then
-    echo "Build tools are not installed"
-    exit 1
-fi
-bindir=/srv/ceph-build
 
 vers=`cat ./dist/version`
 # create a release directory for ceph-build tools
@@ -27,7 +22,6 @@ echo "${vers}-1" > release/${vers}/debian_version
 
 echo "Building RPMs"
 
-
 # The below contents ported from /srv/ceph-build/build_rpms.sh ::
 #     $bindir/build_rpms.sh ./release $vers
 #
@@ -35,10 +29,6 @@ echo "Building RPMs"
 releasedir="./release"
 cephver=$vers
 
-
-bindir=`dirname $0`
-echo "$bindir" | grep -v -q '^/' && bindir=`pwd`"/$bindir"
-
 # Contents below ported from /srv/ceph-build/get_rpm_dist.sh
 # dist=`$bindir/get_rpm_dist.sh`
 
@@ -102,7 +92,6 @@ rpmbuild -ba --define "_topdir ${BUILDAREA}" ceph.spec
 
 echo done
 
-
 #Collect Artifacts
 mkdir -p dist/rpm/${DIST}
 mv release/${vers}/rpm/*/SRPMS ./dist/rpm/${DIST}/.