diff options
| author | Kefu Chai <kchai@redhat.com> | 2017-11-24 03:27:19 +0100 |
|---|---|---|
| committer | Kefu Chai <kchai@redhat.com> | 2017-11-24 04:13:16 +0100 |
| commit | 2218efa005ab871f26402b5dd33b2e599897c11f (patch) | |
| tree | e2bd81efd7ea3ba436378b5bb2aa599ac87853d1 /make-dist | |
| parent | Merge pull request #18614 from tchaikov/wip-osd-mgrreport (diff) | |
| download | ceph-2218efa005ab871f26402b5dd33b2e599897c11f.tar.xz ceph-2218efa005ab871f26402b5dd33b2e599897c11f.zip | |
make-dist: repackage boost in the correct path
before this change, boost is put into ./src. after this change, it is
put into $outfile/src. i.e. something like
ceph-12.1.2-4592-gf5f2ced624/src .
Signed-off-by: Kefu Chai <kchai@redhat.com>
Diffstat (limited to 'make-dist')
| -rwxr-xr-x | make-dist | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/make-dist b/make-dist index 0b4632a5c76..80a9109228a 100755 --- a/make-dist +++ b/make-dist @@ -48,7 +48,7 @@ download_boost() { set -e tar xjf $boost_fname -C src mv src/boost_${boost_version_underscore} src/boost - tar cf ${outfile}.boost.tar src/boost + tar cf ${outfile}.boost.tar ${outfile}/src/boost rm -rf src/boost } @@ -81,14 +81,6 @@ else rpm_release=0 fi -# NOTE: If you change this version number make sure the package is available -# at the three URLs referenced below (may involve uploading to download.ceph.com) -boost_version=1.63.0 -download_boost $boost_version 1c837ecd990bb022d07e7aab32b09847 \ - https://dl.bintray.com/boostorg/release/$boost_version/source \ - https://downloads.sourceforge.net/project/boost/boost/$boost_version \ - https://download.ceph.com/qa - for spec in ceph.spec.in alpine/APKBUILD.in; do cat $spec | sed "s/@VERSION@/$rpm_version/g" | @@ -97,6 +89,13 @@ for spec in ceph.spec.in alpine/APKBUILD.in; do done ln -s . $outfile tar cvf $outfile.version.tar $outfile/src/.git_version $outfile/ceph.spec $outfile/alpine/APKBUILD +# NOTE: If you change this version number make sure the package is available +# at the three URLs referenced below (may involve uploading to download.ceph.com) +boost_version=1.63.0 +download_boost $boost_version 1c837ecd990bb022d07e7aab32b09847 \ + https://dl.bintray.com/boostorg/release/$boost_version/source \ + https://downloads.sourceforge.net/project/boost/boost/$boost_version \ + https://download.ceph.com/qa tar --concatenate -f $outfile.all.tar $outfile.version.tar tar --concatenate -f $outfile.all.tar $outfile.boost.tar tar --concatenate -f $outfile.all.tar $outfile.tar |