From 1be0dd5052b1087c8ad7f3b0dee2111e91d3b9ca Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Sat, 13 Oct 2012 22:08:37 +0000 Subject: include FIRMWARE packages from Cards+ in detected graphical drivers (#6438, #7641): - not to remove radeon-firmware in draklive-install if a matching card is present - to install radeon-firmware during install --- perl-install/pkgs.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'perl-install/pkgs.pm') diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index ce22d1a58..811bd3a23 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -184,8 +184,10 @@ sub detect_graphical_drivers { @cards = Xconfig::card::probe(); } + my @firmware_pkgs = grep { $_ } uniq(map { $_->{FIRMWARE} } @cards); my @drivers = grep { $_ } uniq(map { $_->{Driver2} } @cards); - map { Xconfig::proprietary::pkgs_for_Driver2($_, $do_pkgs) } @drivers; + my @proprietary_pkgs = map { Xconfig::proprietary::pkgs_for_Driver2($_, $do_pkgs) } @drivers; + return @firmware_pkgs, @proprietary_pkgs; } sub detect_network_drivers { -- cgit v1.2.1