[tor-commits] [tor-browser-build/master] Add support for optional local configuration file rbm.local.conf

[boklm at torproject.org]

commit 99f69d0aa0665e57a5036f66e16dbdcd0fea94d0
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Tue Feb 14 00:40:49 2017 +0100

    Add support for optional local configuration file rbm.local.conf
    
    Update rbm and add example rbm.local.conf file.
---
 .gitignore             |  1 +
 README                 |  2 ++
 README.BUILD_ERRORS    |  2 ++
 rbm                    |  2 +-
 rbm.local.conf.example | 22 ++++++++++++++++++++++
 5 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index c755fcf..98554a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ alpha
 alpha_nightly
 nightly
 hardened
+rbm.local.conf
diff --git a/README b/README
index 775f782..001a692 100644
--- a/README
+++ b/README
@@ -89,6 +89,8 @@ the RBM_NO_DEBUG environment variable to 1:
 
    export RBM_NO_DEBUG=1
 
+Or set the debug option to 0 in the rbm.local.conf file.
+
 If you want to select the output directory, you can use rbm's --output-dir
 option. You can look at the Makefile to find the rbm command for what
 you want to build, and add the --output-dir option. For example if you
diff --git a/README.BUILD_ERRORS b/README.BUILD_ERRORS
index c1ee70c..6be4319 100644
--- a/README.BUILD_ERRORS
+++ b/README.BUILD_ERRORS
@@ -42,3 +42,5 @@ $ 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 b/rbm
index af970a5..a57b484 160000
--- a/rbm
+++ b/rbm
@@ -1 +1 @@
-Subproject commit af970a558f122acaba080e0b015e3293f74509fb
+Subproject commit a57b4846c8aba5697ce1f197996e2962ffb5b534
diff --git a/rbm.local.conf.example b/rbm.local.conf.example
new file mode 100644
index 0000000..fab3213
--- /dev/null
+++ b/rbm.local.conf.example
@@ -0,0 +1,22 @@
+---
+### This file is used to override options from rbm.conf to adapt them
+### to your local setup.
+###
+### Copy this file as rbm.local.conf to enable it, and uncomment the
+### 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.
+#tmp_dir: /tmp
+
+### The debug option defines whether a debugging shell should be opened
+### automatically in the build directory/container in case of build
+### failure. If you are doing automated builds, you might want to disable
+### this.
+#debug: 0
+
+var:
+  local_conf: 1
+
+# vim: filetype=yaml sw=2