From 878f4b49f62648f856839d540e805dfbec884f35 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Fri, 12 Oct 2012 17:23:01 +0200 Subject: [PATCH] [scripts] fixup nvidia drivers legacy setup --- scripts/remaster_generic_inner_chroot_script_after.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/remaster_generic_inner_chroot_script_after.sh b/scripts/remaster_generic_inner_chroot_script_after.sh index a5c0740..2553aa6 100755 --- a/scripts/remaster_generic_inner_chroot_script_after.sh +++ b/scripts/remaster_generic_inner_chroot_script_after.sh @@ -153,12 +153,14 @@ setup_proprietary_gfx_drivers() { kernel_tag="#$(cat "${kernel_tag_file}")" rm -rf /var/lib/entropy/client/packages/packages*/${mydir}/*/x11-drivers* - ACCEPT_LICENSE="NVIDIA" equo install --fetch --nodeps =x11-drivers/nvidia-drivers-173*$kernel_tag - # dead with >=xorg-server-1.11 - # ACCEPT_LICENSE="NVIDIA" equo install --fetch --nodeps =x11-drivers/nvidia-drivers-96.43.20*$kernel_tag + ACCEPT_LICENSE="NVIDIA" equo install --fetch --nodeps =x11-drivers/nvidia-userspace-173*$kernel_tag \ + =x11-drivers/nvidia-drivers-173*$kernel_tag + ACCEPT_LICENSE="NVIDIA" equo install --fetch --nodeps =x11-drivers/nvidia-drivers-96*$kernel_tag \ + =x11-drivers/nvidia-userspace-96*$kernel_tag ## not working with >=xorg-server-1.5 ## ACCEPT_LICENSE="NVIDIA" equo install --fetch --nodeps ~x11-drivers/nvidia-drivers-71.86.*$kernel_tag - mv /var/lib/entropy/client/packages/packages-nonfree/${mydir}/*/x11-drivers\:nvidia-drivers*.tbz2 /install-data/drivers/ + mv /var/lib/entropy/client/packages/packages-nonfree/${mydir}/*/x11-drivers\:nvidia-{drivers,userspace}*.tbz2 \ + /install-data/drivers/ # if we ship with ati-drivers, we have KMS disabled by default. # and better set driver arch to classic