Commit 0b025d7f authored by Cyril Brulebois's avatar Cyril Brulebois
Browse files

Specify the right gzip call through a tar option. 

Setting gzip options through GZIP doesn't seem to be supported any more:

    gzip: warning: GZIP environment variable is deprecated; use an alias or script

so specify the compression command directly in the tar call.
parent f153c29e

build/util/gen-tarball

+1 −1
Original line number Diff line number Diff line
@@ -28,4 +28,4 @@ fi 
# https://wiki.debian.org/ReproducibleBuilds/FileOrderInTarballs

# and without timestamp in the gzip header, see

# https://wiki.debian.org/ReproducibleBuilds/TimestampsInGzipHeaders

( cd "$SOURCE_DIR" && find . -print0 | LC_ALL=C sort -z | GZIP=-n tar --no-recursion --null -T - -czvf -) > "$OUTPUT_FILE"
 
( cd "$SOURCE_DIR" && find . -print0 | LC_ALL=C sort -z | tar --no-recursion --null -T - -I 'gzip -n' -cvf -) > "$OUTPUT_FILE"

debian/changelog

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ debian-installer (20190119) UNRELEASED; urgency=medium 
  * Review and merge Chris Lamb's work making d-i build reproducibly

    (Closes: #900918), with many thanks! Remaining issues seem related to

    fontconfig's cache and xorriso calls.

  * gen-tarball: specify the complete gzip command through a tar option

    instead of using the now-deprecated GZIP environment variable.



  [ Chris Lamb ]

  * Set BUILD_DATE based on SOURCE_DATE_EPOCH, rather than the other way