Commit a182f67a authored by boklm's avatar boklm Committed by Georg Koppen
Browse files

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.
parent 8d61174e

rbm @ 03d53fcb

Original line number Diff line number Diff line 
Subproject commit 5a41aae4a0d745f74b675d3c9c142b3d5fb3ca09
 
Subproject commit 03d53fcb0444fe9d752719bfbb62e3658d15d26d

rbm.conf

+1 −1
Original line number Diff line number Diff line
@@ -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