summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <blino@mageia.org>2012-10-13 22:08:37 +0000
committerOlivier Blin <blino@mageia.org>2012-10-13 22:08:37 +0000
commit452e2c6ff39ed80dcee4d0bb02a9d6570872c5fa (patch)
tree2fc352cf255a162d4b05bc4fb15b1120db013b45
parent062c48f65a0c160d68ab9d28d4d8f84c27597ce6 (diff)
downloaddrakx-452e2c6ff39ed80dcee4d0bb02a9d6570872c5fa.tar
drakx-452e2c6ff39ed80dcee4d0bb02a9d6570872c5fa.tar.gz
drakx-452e2c6ff39ed80dcee4d0bb02a9d6570872c5fa.tar.bz2
drakx-452e2c6ff39ed80dcee4d0bb02a9d6570872c5fa.tar.xz
drakx-452e2c6ff39ed80dcee4d0bb02a9d6570872c5fa.zip
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
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/install/NEWS3
-rw-r--r--perl-install/pkgs.pm4
3 files changed, 9 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 04dc2b0e6..f1fb134b1 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- include FIRMWARE packages from Cards+ in detected graphical drivers,
+ not to remove radeon-firmware if a matching card is present (#6438, #7641)
+
Version 14.47 - 12 October 2012
- diskdrake:
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index e96d5eb5f..dcf80a73e 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- include FIRMWARE packages from Cards+ in detected graphical drivers,
+ to install radeon-firmware during install (#6438, #7641)
+
Version 14.47 - 12 October 2012
- offer resizing NTFS again (broken by ntfsprogs -> ntfs-3g switch)
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 {