From: Alfredo Deza <adeza@redhat.com>
Date: Fri, 5 Jun 2015 20:36:29 +0000 (-0400)
Subject: port release_tarballs.sh to ceph-setup/build/build
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=6d6342288de13bf454f1fdc81b4323af2be2b13e;p=ceph-build.git

port release_tarballs.sh to ceph-setup/build/build

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

diff --git a/ceph-setup/build/build b/ceph-setup/build/build
index 7c98b451..bfc7a4d3 100644
--- a/ceph-setup/build/build
+++ b/ceph-setup/build/build
@@ -12,7 +12,7 @@ echo "  WS=$WORKSPACE"
 echo "  PWD=$(pwd)"
 echo "  BRANCH=$BRANCH"
 
-if [ -x "$BRANCH" ] ; then 
+if [ -x "$BRANCH" ] ; then
     echo "No git branch was supplied"
     exit 1
 fi
@@ -64,11 +64,71 @@ if [ $? -ne 0 ] ; then
 fi
 
 mkdir -p release
-$bindir/release_tarball.sh release release/version
-if [ $? -ne 0 ] ; then
-    echo "make tarballs failed"
-    exit 2
+
+# Contents below used to come from /srv/release_tarball.sh and
+# was called like::
+#
+#    $bindir/release_tarball.sh release release/version
+
+releasedir='release'
+versionfile='release/version'
+
+if git diff --quiet ; then
+    echo repository is clean
+else
+    echo
+    echo "**** REPOSITORY IS DIRTY ****"
+    echo
+    if [ "$force" != "force" ]; then
+	echo "add 'force' argument if you really want to continue."
+	exit 1
+    fi
+    echo "forcing."
+fi
+
+cephver=`git describe --match "v*" | sed s/^v//`
+echo current version $cephver
+
+srcdir=`pwd`
+
+if [ -d "$releasedir/$cephver" ]; then
+    echo "$releasedir/$cephver already exists; reuse that release tarball"
+else
+    echo building tarball
+    rm ceph-*.tar.gz || true
+    rm ceph-*.tar.bz2 || true
+    make dist
+    make dist-bzip2
+
+    vers=`ls ceph-*.tar.gz | cut -c 6- | sed 's/.tar.gz//'`
+    echo tarball vers $vers
+
+    echo extracting
+    mkdir -p $releasedir/$cephver/rpm
+    cp rpm/*.patch $releasedir/$cephver/rpm || true
+    cd $releasedir/$cephver
+
+    tar zxf $srcdir/ceph-$vers.tar.gz
+    [ "$vers" != "$cephver" ] && mv ceph-$vers ceph-$cephver
+
+    tar zcf ceph_$cephver.orig.tar.gz ceph-$cephver
+    cp -a ceph_$cephver.orig.tar.gz ceph-$cephver.tar.gz
+
+    tar jcf ceph-$cephver.tar.bz2 ceph-$cephver
+
+    # copy debian dir, too
+    cp -a $srcdir/debian debian
+    cd $srcdir
+
+    # copy in spec file, too
+    cp ceph.spec $releasedir/$cephver
+fi
+
+if [ -n "$versionfile" ]; then
+    echo $cephver > $versionfile
+    echo "wrote $cephver to $versionfile"
 fi
+
 vers=`cat release/version`
 
 (