From: Sage Weil <sage@redhat.com>
Date: Fri, 10 Jun 2016 20:47:32 +0000 (-0400)
Subject: make_dist.sh: include src/.git_version and src/ceph_ver.h
X-Git-Tag: v11.0.0~101^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cb02943e030c589a699874d89b6e778ff0f6e47a;p=ceph.git

make_dist.sh: include src/.git_version and src/ceph_ver.h

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/make_dist.sh b/make_dist.sh
index 044ad8316ff6..89781034801f 100755
--- a/make_dist.sh
+++ b/make_dist.sh
@@ -22,7 +22,7 @@ fi
 
 # clean out old cruft...
 echo "cleanup..."
-rm -f $outfile.tar $outfile.tar.gz
+rm -f $outfile*
 
 # build new tarball
 echo "building tarball..."
@@ -30,6 +30,17 @@ bin/git-archive-all.sh --prefix ceph-$version/ \
 		       --verbose \
 		       --ignore corpus \
 		       $outfile.tar
+
+echo "including src/.git_version and src/ceph_ver.h..."
+src/make_version -g src/.git_version -c src/ceph_ver.h
+ln -s . $outfile
+tar cvf $outfile.version.tar $outfile/src/.git_version $outfile/src/ceph_ver.h
+tar --concatenate -f $outfile.both.tar $outfile.version.tar
+tar --concatenate -f $outfile.both.tar $outfile.tar
+mv $outfile.both.tar $outfile.tar
+rm $outfile
+rm -f $outfile.version.tar
+
 echo "compressing..."
 bzip2 -9 $outfile.tar