commit 3960ad5d91701ef9b22e57eef8532e7a2e19b9db Author: Richard Pospesel richard@torproject.org Date: Wed Aug 1 11:29:46 2018 -0700
Bug: 27020: RBM build fails with runc version 1.0.1
runc version on Ubuntu 18.04 is 1.0.1 which is not currently handled in rbm.conf, so the runc_spec100 flag does not get set properly. This patch changes it so the runc_spec100 flag is set if a spec string greater than 1.0.0 is found. --- rbm.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rbm.conf b/rbm.conf index d046d86..8cfa5e2 100644 --- a/rbm.conf +++ b/rbm.conf @@ -390,11 +390,11 @@ ENV: my ($out) = capture_exec('sudo', 'runc', '--version'); return !($out =~ m/^runc version 0.1.1/); }, - # runc_spec100 is true if runc spec is exactly 1.0.0 + # runc_spec100 is true if runc spec is at least 1.0.0 # We will need to update this when there is a new spec version available runc_spec100 => sub { my ($out) = capture_exec('sudo', 'runc', '--version'); - return $out =~ m/^spec: 1.0.0$/m; + return $out =~ m/^.*spec: 1.[0-9]+.[0-9]+$/m; }, }, )