summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2016-11-08 09:33:45 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2016-11-08 09:55:50 +0100
commit4e73282f24a27d6a1d443c4ce0bae1adfc88d2a4 (patch)
tree43a88651d69a468ea41ac09cf029f5a4aae4e848
parent83a4d365863c4c096c541fe252e0678a622ac59f (diff)
downloaddrakx-kbd-mouse-x11-4e73282f24a27d6a1d443c4ce0bae1adfc88d2a4.tar
drakx-kbd-mouse-x11-4e73282f24a27d6a1d443c4ce0bae1adfc88d2a4.tar.gz
drakx-kbd-mouse-x11-4e73282f24a27d6a1d443c4ce0bae1adfc88d2a4.tar.bz2
drakx-kbd-mouse-x11-4e73282f24a27d6a1d443c4ce0bae1adfc88d2a4.tar.xz
drakx-kbd-mouse-x11-4e73282f24a27d6a1d443c4ce0bae1adfc88d2a4.zip
x11-driver-video-modesetting was merged in xserver
so do not try uselessly to install it...
-rw-r--r--NEWS1
-rw-r--r--lib/Xconfig/card.pm2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 300393e..f2dbd85 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,5 @@
- XFdrake
+ o do not try uselessly to install x11-driver-video-modesetting
o when testing X:
* fix displaying test background (as well as running)
diff --git a/lib/Xconfig/card.pm b/lib/Xconfig/card.pm
index 92d0457..b87dce8 100644
--- a/lib/Xconfig/card.pm
+++ b/lib/Xconfig/card.pm
@@ -331,7 +331,7 @@ Do you wish to use it?")), 1))) {
Xconfig::proprietary::handle_FIRMWARE($do_pkgs, $card, $o_in);
# handle_FIRMWARE could've changed $card->{Driver}
- my @must_have = "x11-driver-video-$card->{Driver}";
+ my @must_have = if_($card->{Driver} ne 'modesetting', "x11-driver-video-$card->{Driver}");
$do_pkgs->ensure_are_installed([ @must_have, @packages ], 1) or
@must_have == listlength($do_pkgs->are_installed(@must_have))