[tor-commits] [builders/rbm] branch master updated: Bug 40036: Avoid some calls to lsb_release

[gitolite role]

This is an automated email from the git hooks/post-receive script.

boklm pushed a commit to branch master
in repository builders/rbm.

The following commit(s) were added to refs/heads/master by this push:
     new 87d4a77  Bug 40036: Avoid some calls to lsb_release
87d4a77 is described below

commit 87d4a77a6f6bf747207800e601552a70d9910ffd
Author: Nicolas Vigier <boklm at torproject.org>
AuthorDate: Wed Apr 6 11:40:34 2022 +0200

    Bug 40036: Avoid some calls to lsb_release
---
 doc/options_misc.asc     |  6 ++++--
 lib/RBM/DefaultConfig.pm | 13 +------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/doc/options_misc.asc b/doc/options_misc.asc
index 876768b..5612df3 100644
--- a/doc/options_misc.asc
+++ b/doc/options_misc.asc
@@ -28,14 +28,16 @@ tar::
         set to +timestamp+. This option takes a +tar_src+ argument which
         is an array containing source files or directories, and a +tar_args+
         argument which is the tar arguments to create the file (something
-        like '-cf filename.tar').
+        like '-cf filename.tar'). By default, GNU options are used in
+        tar and find, but you can disable that with +gnu_utils+.
 
 zip::
         Use this option instead of 'zip' in build scripts when you want
         to create deterministic zip files. This option takes a +zip_src+
         argument which is an array containing source files or directories,
         and a +zip_args+ arguments which is usually the destination zip
-        file, and optionaly other zip options.
+        file, and optionaly other zip options. By default, GNU options
+        are used in find, but you can disable that with +gnu_utils+.
 
 install_package::
         This option can be used in a script when you need to install a
diff --git a/lib/RBM/DefaultConfig.pm b/lib/RBM/DefaultConfig.pm
index 059ffdd..516156e 100644
--- a/lib/RBM/DefaultConfig.pm
+++ b/lib/RBM/DefaultConfig.pm
@@ -412,18 +412,7 @@ mv -f "\$tmpfile" [% shell_quote(dest_dir _ "/" _ c("filename")) %]
 URLGET
     sig_ext => [ qw(gpg asc sig) ],
     enable => 1,
-    gnu_utils => sub {
-        my ($project, $options) = @_;
-        my $distro = RBM::project_config($project, 'lsb_release/id', $options);
-        my %non_gnu = (
-            'Mac OS X'  => 1,
-            NetBSD      => 1,
-            OpenBSD     => 1,
-            FreeBSD     => 1,
-            DragonFly   => 1,
-        );
-        return ! $non_gnu{$distro};
-    },
+    gnu_utils => 1,
     tar    => <<TAR_END,
 [%- SET src = c('tar_src', { error_if_undef => 1 }) -%]
 find [% src.join(' ') %] [% IF c('gnu_utils') %]-executable[% ELSE %]-perm +0111[% END %] -exec chmod 700 {} \\;

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.