commit 2dfbef2eecb1ca19467b095b16c18f9c78d28445 Merge: 4074cbc 6063d5c Author: Georg Koppen <gk@torproject.org> Date: Wed Jun 6 19:09:08 2018 +0000 Merge remote-tracking branch 'boklm/bug_22242' projects/firefox/build | 6 +++++- projects/firefox/config | 4 +++- rbm.conf | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --cc projects/firefox/config index 97efc7b,21efac7..6cb17c7 --- a/projects/firefox/config +++ b/projects/firefox/config @@@ -83,11 -84,9 +85,11 @@@ input_files enable: '[% c("var/linux") %]' - project: selfrando name: selfrando - enable: '[% c("var/linux") && ! c("var/release") %]' + enable: '[% c("var/selfrando") %]' - filename: fix-info-plist.py enable: '[% c("var/osx") %]' + - filename: no-dmg.patch + enable: '[% c("var/osx") %]' - URL: https://people.torproject.org/~gk/mirrors/sources/msvcr100.dll sha256sum: 8793353461826fbd48f25ea8b835be204b758ce7510db2af631b28850355bd18 enable: '[% c("var/windows-i686") %]' diff --cc rbm.conf index 28ce6f9,c1b49f0..b3dd729 --- a/rbm.conf +++ b/rbm.conf @@@ -162,9 -162,11 +162,10 @@@ targets var: linux: 1 compiler: gcc - # We only build snowflake for linux and osx on the alpha and nightly - # channels for now. + # We only build snowflake for linux on the alpha and nightly channels for now. snowflake: '[% c("var/alpha") || c("var/nightly") %]' fteproxy: 1 + selfrando: '[% ! c("var/release") %]' container: suite: wheezy deps: