commit fc7cf9fb69855238648bdb59135636d422746779 Author: Georg Koppen gk@torproject.org Date: Sat Oct 31 08:18:08 2015 +0000
Bug 16909: Don't download submodules while building
a) this is wrong and b) it is currently broken due to a certificate error. --- gitian/descriptors/linux/gitian-bundle.yml | 17 +++++++---------- gitian/descriptors/mac/gitian-bundle.yml | 17 +++++++---------- gitian/descriptors/windows/gitian-bundle.yml | 17 +++++++---------- 3 files changed, 21 insertions(+), 30 deletions(-)
diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index c4e342b..a62bc68 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -108,16 +108,13 @@ script: | # Workaround for git not knowing `git submodule -f` in the version shipped in # 10.04. sed 's/recursive -f/recursive/' -i makexpi.sh - # We are invoking the build script with a particular tag to avoid #10066. This - # does not work for nightlies as there is no "master" tag in that sense. But - # we don't need to care about that as we don't need reproducibility for - # nightly builds. - if [ $HTTPSE_TAG != "master" ]; - then - ./makexpi.sh $HTTPSE_TAG - else - ./makexpi.sh - fi + # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in + # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 + # The solution there does not work for us as doing something like + # |./makexpi.sh foo| to build tag |foo| is a) trying to download the sources + # during build time (again) and b) broken due to a certificate error. + rm -f .git/refs/heads/master + ./makexpi.sh # Since 5.0.2 a .xpi for AMO is built, too. We don't need it. rm ./pkg/*-amo.xpi cp pkg/*.xpi ../tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere@eff.org.xpi diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index e9af0c2..767f3d4 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -108,16 +108,13 @@ script: | cd ../../../ # cd https-everywhere - # We are invoking the build script with a particular tag to avoid #10066. This - # does not work for nightlies as there is no "master" tag in that sense. But - # we don't need to care about that as we don't need reproducibility for - # nightly builds. - if [ $HTTPSE_TAG != "master" ]; - then - ./makexpi.sh $HTTPSE_TAG - else - ./makexpi.sh - fi + # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in + # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 + # The solution there does not work for us as doing something like + # |./makexpi.sh foo| to build tag |foo| is a) trying to download the sources + # during build time (again) and b) broken due to a certificate error. + rm -f .git/refs/heads/master + ./makexpi.sh # Since 5.0.2 a .xpi for AMO is built, too. We don't need it. rm ./pkg/*-amo.xpi cp pkg/*.xpi ../$TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere@eff.org.xpi diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index f84afd8..cc86d55 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -96,16 +96,13 @@ script: | cd ../../../ # cd https-everywhere - # We are invoking the build script with a particular tag to avoid #10066. This - # does not work for nightlies as there is no "master" tag in that sense. But - # we don't need to care about that as we don't need reproducibility for - # nightly builds. - if [ $HTTPSE_TAG != "master" ]; - then - ./makexpi.sh $HTTPSE_TAG - else - ./makexpi.sh - fi + # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in + # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 + # The solution there does not work for us as doing something like + # |./makexpi.sh foo| to build tag |foo| is a) trying to download the sources + # during build time (again) and b) broken due to a certificate error. + rm -f .git/refs/heads/master + ./makexpi.sh # Since 5.0.2 a .xpi for AMO is built, too. We don't need it. rm ./pkg/*-amo.xpi cp ./pkg/*.xpi ../tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere@eff.org.xpi