diff options
| author | Sage Weil <sage@redhat.com> | 2016-10-26 16:51:06 +0200 |
|---|---|---|
| committer | Sage Weil <sage@redhat.com> | 2016-10-31 15:10:47 +0100 |
| commit | dd6d3d920b6d82c20a1031a406d7e7f3a8118dac (patch) | |
| tree | 06ac6939bda3409375a701d31bac66caabe5d3d3 /make-dist | |
| parent | src/CMakeLists.txt: remove leading 'v' from version string (diff) | |
| download | ceph-dd6d3d920b6d82c20a1031a406d7e7f3a8118dac.tar.xz ceph-dd6d3d920b6d82c20a1031a406d7e7f3a8118dac.zip | |
make-dist: do not generate ceph_ver.h
cmake does this on its own, and puts it in a different location (the build
dir).
Signed-off-by: Sage Weil <sage@redhat.com>
Diffstat (limited to 'make-dist')
| -rwxr-xr-x | make-dist | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/make-dist b/make-dist index acfea8725c3..c66e988cdf3 100755 --- a/make-dist +++ b/make-dist @@ -32,8 +32,8 @@ bin/git-archive-all.sh --prefix ceph-$version/ \ $outfile.tar # populate files with version strings -echo "including src/.git_version, src/ceph_ver.h, ceph.spec" -src/make_version -g src/.git_version -c src/ceph_ver.h +echo "including src/.git_version, ceph.spec" +src/make_version -g src/.git_version # if the version has '-' in it, it has a 'release' part, # like vX.Y.Z-N-g<shortsha1>. If it doesn't, it's just @@ -53,7 +53,7 @@ cat ceph.spec.in | \ sed "s/@RPM_RELEASE@/$rpm_release/g" | sed "s/@TARBALL_BASENAME@/ceph-$version/g" > ceph.spec ln -s . $outfile -tar cvf $outfile.version.tar $outfile/src/.git_version $outfile/src/ceph_ver.h $outfile/ceph.spec +tar cvf $outfile.version.tar $outfile/src/.git_version $outfile/ceph.spec tar --concatenate -f $outfile.both.tar $outfile.version.tar tar --concatenate -f $outfile.both.tar $outfile.tar mv $outfile.both.tar $outfile.tar |