diff options
| -rw-r--r-- | perl-install/pkgs.pm | 6 | ||||
| -rwxr-xr-x | perl-install/standalone/remove-unused-packages | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index ce22d1a58..58f14b161 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -168,7 +168,9 @@ sub simple_read_rpmsrate { sub detect_rpmsrate_hardware_packages { my ($o_match_all_hardware, $ignore_flags) = @_; - grep { !/openoffice|java/ } simple_read_rpmsrate($o_match_all_hardware, $ignore_flags); + my @l = grep { !/openoffice|java/ } simple_read_rpmsrate($o_match_all_hardware, $ignore_flags); + use Data::Dumper; + print Dumper([ sort(@l) ]); } sub detect_graphical_drivers { @@ -185,7 +187,7 @@ sub detect_graphical_drivers { } my @drivers = grep { $_ } uniq(map { $_->{Driver2} } @cards); - map { Xconfig::proprietary::pkgs_for_Driver2($_, $do_pkgs) } @drivers; + map { Xconfig::proprietary::pkgs_for_Driver2($_, $do_pkgs), if_($card->{FIRMWARE}, $card->{FIRMWARE}) } @drivers; } sub detect_network_drivers { diff --git a/perl-install/standalone/remove-unused-packages b/perl-install/standalone/remove-unused-packages index bc54c3e1c..4eb60c2e9 100755 --- a/perl-install/standalone/remove-unused-packages +++ b/perl-install/standalone/remove-unused-packages @@ -6,6 +6,6 @@ use interactive; use do_pkgs; use standalone; -my $in = interactive->vnew('su'); +my $in = interactive->vnew();#'su'); my $do_pkgs = do_pkgs::do_pkgs($in); pkgs::remove_unused_packages($in, $do_pkgs); |