osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/34978?usp=email )

Change subject: tarballs: git archive: make proper tar.bz2 ......................................................................

tarballs: git archive: make proper tar.bz2

Compress the tarball from "git archive" with bzip2 to turn it into a proper .tar.bz2. Previously the archive was named .tar.bz2, but it was just a regular tarball as git archive didn't guess the type from the filename (supposedly this works for .tar.gz and some others) and just defaulted to tar.

Move the code that adds build_dep.tar.gz to the archive before the bzip2 call, because tar can't add files to the archive if it is compressed.

Change-Id: I5830f9123150540a6467c19c64461d2fa1972a52 --- M scripts/tarballs/publish-tarballs-for-tags.sh 1 file changed, 27 insertions(+), 7 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/78/34978/1

diff --git a/scripts/tarballs/publish-tarballs-for-tags.sh b/scripts/tarballs/publish-tarballs-for-tags.sh index 05d9f30..46a2e17 100755 --- a/scripts/tarballs/publish-tarballs-for-tags.sh +++ b/scripts/tarballs/publish-tarballs-for-tags.sh @@ -260,14 +260,16 @@ esac su build -c "make dist-bzip2" else - su build -c "git archive --prefix=$prefix/ -o $tarball_name $tag" - fi + su build -c "git archive --prefix=$prefix/ -o $prefix.tar $tag"

- # Erlang projects: add build depends to release tarball - if [ -e build_dep.tar.gz ]; then - su build -c "mkdir $prefix" - su build -c "mv build_dep.tar.gz $prefix" - su build -c "tar -rf $tarball_name $prefix/build_dep.tar.gz" + # Erlang projects: add build depends to release tarball + if [ -e build_dep.tar.gz ]; then + su build -c "mkdir $prefix" + su build -c "mv build_dep.tar.gz $prefix" + su build -c "tar -rf $prefix.tar $prefix/build_dep.tar.gz" + fi + + su build -c "bzip2 -9 $prefix.tar" fi "; then echo "$LOG_PREFIX Building tarball failed!"