diff options
author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2016-11-08 09:33:45 +0100 |
---|---|---|
committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2016-11-08 09:55:50 +0100 |
commit | 4e73282f24a27d6a1d443c4ce0bae1adfc88d2a4 (patch) | |
tree | 43a88651d69a468ea41ac09cf029f5a4aae4e848 | |
parent | 83a4d365863c4c096c541fe252e0678a622ac59f (diff) | |
download | drakx-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-- | NEWS | 1 | ||||
-rw-r--r-- | lib/Xconfig/card.pm | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -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)) |