commit a182f67a608ad65fbbde4238aff7ee7c2f01b162
Author: Nicolas Vigier <boklm(a)torproject.org>
Date: Mon Nov 12 18:34:13 2018 +0100
Bug 27265: fix output_dir value in sub-projects
We update rbm for bug 27265: fix output_dir value in sub-projects.
As part of this fix, the patch in rbm is changing how the value of
output_dir is overriden by rbm when handling input_files: the output_dir
option is now defined under norec, which has priority over normal
options but is not inherided in sub-projects. In rbm.conf we are also
changing the output_dir option in var/build_id_txt so that the build ids
do not depend on the path on the current system. Because of the change
in rbm we now need to reset `norec` so that our value of `output_dir` is
correctly taken into account.
---
rbm | 2 +-
rbm.conf | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/rbm b/rbm
index 5a41aae..03d53fc 160000
--- a/rbm
+++ b/rbm
@@ -1 +1 @@
-Subproject commit 5a41aae4a0d745f74b675d3c9c142b3d5fb3ca09
+Subproject commit 03d53fcb0444fe9d752719bfbb62e3658d15d26d
diff --git a/rbm.conf b/rbm.conf
index cb5e972..018df39 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -46,7 +46,7 @@ var:
[% END -%]
input_files: [% c("input_files_id") %]
build:
- [% c("build", { filename => 'f', output_dir => '/out' }) %]
+ [% c("build", { filename => 'f', output_dir => '/out', norec => {} }) %]
container:
dir: '[% c("rbm_tmp_dir") %]/rbm-containers/[% sha256(c("build_id")) %]'
user: rbm