Page MenuHomePhabricator

Merge #16141 and #16184: build: remove GZIP export from gitian descriptors
ClosedPublic

Authored by jasonbcox on Oct 26 2020, 22:24.

Details

Summary

bc8863b81922eb878519f328e9b0c7974aaa34ff depends: remove usage of TAR_OPTIONS (fanquake)
3ff1f2a319fc619954736d1e540ccbebc818ff11 build: remove export GZIP from gitian descriptors (fanquake)

Pull request description:

The `GZIP` environment variable is [deprecated](https://www.gnu.org/software/gzip/manual/gzip.html#Environment), and everywhere that we invoke `gzip` we are already passing `-9n` directly, i.e:
```base
  find bitcoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
```

```bash
GZIP="-9n" gzip -h
gzip: warning: GZIP environment variable is deprecated; use an alias or script
Usage: gzip [OPTION]... [FILE]...
```

Merge #16184: scripted-diff: gitian: Use REFERENCE_DATETIME directly.

Pull request description:

Fixes regression introduced by #16141.

```
-BEGIN VERIFY SCRIPT-
sed -i 's#\$REFERENCE_DATE\\\\\\ \$REFERENCE_TIME#\${REFERENCE_DATETIME}#g' contrib/gitian-descriptors/*
-END VERIFY SCRIPT-
```

-----

Note that this could have been fixed by escaping properly, but using `REFERENCE_DATETIME` directly is simpler.

Future note: `REFERENCE_{DATE{,DATETIME},TIME}` is a bit ridiculous. At the very _least_ gitian should use epoch, as it is the most parse-able, and preferably set SOURCE_DATE_EPOCH.

Backport of Core PR16141 and PR16184 (to fix a regression in 16141)

Test Plan

Run all Gitian builds in CI

Diff Detail

Event Timeline

jasonbcox planned changes to this revision.

@bot gitian-linux gitian-osx gitian-win

@bot gitian-linux gitian-osx gitian-win

The Gitian builds are still deterministic.

This revision is now accepted and ready to land.Oct 27 2020, 07:54