ceph-build: Fixes for rpm builds.

diff --git a/do_release.sh b/do_release.sh
index 805320c4f4364f8e2e749b4797b35c08fb3a7cde..fb6dc945bbfae3cfd60b90f767c50ce1e3bfb5cb 100755 (executable)
--- a/do_release.sh
+++ b/do_release.sh
@@ -2,6 +2,7 @@
 
 set -e
 
+xterm=${xterm:-0}      # set to 1 to use xterm for remote sessions
 gpgkey='17ED316D'
 
 bindir=`dirname $0`
@@ -55,7 +56,6 @@ do
     ssh $rem sudo rm -r /tmp/release/\* \; sudo mkdir -p /tmp/release \; sudo rm -r /tmp/ceph-build.\* || true
     scp -rp $releasedir/$vers $rem:/tmp/release/$vers
     ssh $rem git clone git://github.com/ceph/ceph-build /tmp/ceph-build.$$
-    exit
     if [ $xterm -eq 1 ]; then
        xterm -l -e ssh $rem sudo /tmp/ceph-build.$$/build_rpms.sh /tmp/release $vers &
     else

diff --git a/gen_yum_repo.sh b/gen_yum_repo.sh
index 5526bf319073a3dd0a9a8c588d49ed7cf976361e..915740c547cb7e1fffab9f1c6340dba3cf83f742 100755 (executable)
--- a/gen_yum_repo.sh
+++ b/gen_yum_repo.sh
@@ -20,7 +20,7 @@ repo_host="$3"
 [ -z "$repo_host" ] && repo_host="gitbuilder-centos6-amd64"
 
 #
-RPMBUILD=$release_dir/rpmbuild
+RPMBUILD=$release_dir
 
 #  Spec File
 cat <<EOF > $RPMBUILD/SPECS/ceph-release.spec

diff --git a/push_to_rpm_repo.sh b/push_to_rpm_repo.sh
index 17704ec90f1ca52455a4db73d18becc5899129da..360738f7c33b8e036a57beebdf2017b6aa19e03e 100755 (executable)
--- a/push_to_rpm_repo.sh
+++ b/push_to_rpm_repo.sh
@@ -6,7 +6,7 @@ releasedir=$1
 repo=$2
 cephvers=$3
 
-keyid=3CF7ABC8
+keyid=17ED316D
 
 usage() {
     echo "usage: $0 releasedir repodir version component"
@@ -33,8 +33,8 @@ do
     # stage the results
     for dir in $releasedir/$cephvers/rpm/$dist/RPMS/*
     do
-        mkdir -p $repo/$cephvers/
-        cp -a $dir  $repo/$cephvers/.
+        mkdir -p $repo/$cephvers/$dist
+        cp -a $dir  $repo/$cephvers/$dist/.
     done
 done