commit b2dd98160a1c07f73f7ab66475cb02be295e4ee5 Author: Nicolas Vigier boklm@torproject.org Date: Thu Sep 7 13:01:02 2017 +0200

Bug 23403: Use tor-browser-build/tmp rather than /tmp as default tmp_dir --- README.BUILD_ERRORS | 16 ---------------- rbm.conf | 1 + rbm.local.conf.example | 6 ++++-- 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/README.BUILD_ERRORS b/README.BUILD_ERRORS index 6be4319..0562f93 100644 --- a/README.BUILD_ERRORS +++ b/README.BUILD_ERRORS @@ -28,19 +28,3 @@ nopat $ qvm-pref --set [vmname] kernelopts 'nopat vsyscall=emulate' ----

- -tmp partition is full ---------------------- - -If your /tmp partition is small, you will get a 'No space left on device' -error during the build. To select an other directory with more space -available to store temporary files, you can define the TMPDIR environment -variable: - ----- -$ mkdir /home/user/tmp -$ export TMPDIR=/home/user/tmp ----- - -You can also define the tmp_dir option in the rbm.local.conf file. - diff --git a/rbm.conf b/rbm.conf index e131c36..a93df7f 100644 --- a/rbm.conf +++ b/rbm.conf @@ -2,6 +2,7 @@ debug: '[% GET ! ENV.RBM_NO_DEBUG %]' compress_tar: gz output_dir: "out/[% project %]" +tmp_dir: '[% c("basedir") %]/tmp' build_log: '[% GET ENV.RBM_LOGS_DIR ? ENV.RBM_LOGS_DIR : "logs" %]/[% project %]-[% c("var/osname") %].log'

pkg_type: build diff --git a/rbm.local.conf.example b/rbm.local.conf.example index 62d13b2..a6401a9 100644 --- a/rbm.local.conf.example +++ b/rbm.local.conf.example @@ -6,8 +6,10 @@ ### options you want to modify.

-### The tmp_dir option defines where temporary files are stored. -### You should modify this if your /tmp partition is small. +### The tmp_dir option defines where temporary files are stored. The +### builds are made from this directory, so using a directory on a fast +### disk can improve build time. By default we are using a tmp directory +### under the tor-browser-build directory. #tmp_dir: /tmp

### The debug option defines whether a debugging shell should be opened