commit ed424fd45a740f1b62857456fbcf616976012986 Author: Nicolas Vigier boklm@torproject.org Date: Mon Apr 8 13:38:36 2019 +0200
Bug 30039: Use the target_prepend option in https-everywhere
Update rbm for #30039, adding support for the target_prepend and target_append options in input_files.
In projects/https-everywhere/config we now use the target_prepend option instead of the target option for the python input file. This does not change the output of the build. However this makes it possible in the future to check the channel or platform we build for in the python project (which was not possible before as we were using the target option, replacing all the initial targets). --- projects/https-everywhere/config | 2 +- rbm | 2 +- rbm.conf | 1 + 3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index a9409cd..d84cdf6 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -32,5 +32,5 @@ input_files: - project: container-image - project: python name: python - target: + target_prepend: - common-stretch diff --git a/rbm b/rbm index 70d1ff3..87adfb7 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit 70d1ff3e7c1c5c69a1b4cdb61ee1b6b9e2a9bc4a +Subproject commit 87adfb7b7be7e7e0f437020dbf8a119673133412 diff --git a/rbm.conf b/rbm.conf index 1a0c6ca..64192b4 100644 --- a/rbm.conf +++ b/rbm.conf @@ -162,6 +162,7 @@ targets: container: suite: stretch arch: amd64 + pre_pkginst: '' deps: - build-essential - python