diff -u nvidia-graphics-drivers-280.13/debian/changelog nvidia-graphics-drivers-280.13/debian/changelog --- nvidia-graphics-drivers-280.13/debian/changelog +++ nvidia-graphics-drivers-280.13/debian/changelog @@ -1,3 +1,14 @@ +nvidia-graphics-drivers (280.13-0ubuntu5) UNRELEASED; urgency=low + + * Drop /usr/share/grub-gfxpayload-lists/blacklist handling; there's + nothing about binary drivers in particular that requires blacklisting, + we just need recovery mode to not start the console in graphics mode. + LP: #854967. + * Drop the initramfs hook in favor of 'alias nouveau/lbm_nouveau off', + so that initramfs framebuffer handling will still work. LP: #864149. + + -- Steve Langasek Sat, 01 Oct 2011 15:06:44 -0700 + nvidia-graphics-drivers (280.13-0ubuntu4) oneiric; urgency=low * debian/rules: diff -u nvidia-graphics-drivers-280.13/debian/nvidia-current.prerm.in nvidia-graphics-drivers-280.13/debian/nvidia-current.prerm.in --- nvidia-graphics-drivers-280.13/debian/nvidia-current.prerm.in +++ nvidia-graphics-drivers-280.13/debian/nvidia-current.prerm.in @@ -30,11 +30,6 @@ # explicit ldconfig due to alternatives ldconfig - - # Update the grub gfxpayload blacklist - if which update-grub-gfxpayload >/dev/null 2>&1; then - update-grub-gfxpayload - fi ;; esac diff -u nvidia-graphics-drivers-280.13/debian/nvidia-current.prerm nvidia-graphics-drivers-280.13/debian/nvidia-current.prerm --- nvidia-graphics-drivers-280.13/debian/nvidia-current.prerm +++ nvidia-graphics-drivers-280.13/debian/nvidia-current.prerm @@ -30,11 +30,6 @@ # explicit ldconfig due to alternatives ldconfig - - # Update the grub gfxpayload blacklist - if which update-grub-gfxpayload >/dev/null 2>&1; then - update-grub-gfxpayload - fi ;; esac diff -u nvidia-graphics-drivers-280.13/debian/nvidia-current.dirs.in nvidia-graphics-drivers-280.13/debian/nvidia-current.dirs.in --- nvidia-graphics-drivers-280.13/debian/nvidia-current.dirs.in +++ nvidia-graphics-drivers-280.13/debian/nvidia-current.dirs.in @@ -1,5 +1,4 @@ #SYSCONFDIR#/modprobe.d -/usr/share/initramfs-tools/conf-hooks.d #SYSCONFDIR#/OpenCL/vendors #AUTOSTARTDIR# #BINDIR# @@ -15,7 +14,6 @@ #MANDIR# #DATADIR#/pixmaps /usr/share/lintian/overrides -/usr/share/grub-gfxpayload-lists/blacklist #PKGDRIVERSDIR# #NVIDIAEXTENSION# /usr/src/#DRIVERNAME#-#VERSION# diff -u nvidia-graphics-drivers-280.13/debian/nvidia-current.dirs nvidia-graphics-drivers-280.13/debian/nvidia-current.dirs --- nvidia-graphics-drivers-280.13/debian/nvidia-current.dirs +++ nvidia-graphics-drivers-280.13/debian/nvidia-current.dirs @@ -1,5 +1,4 @@ /etc/modprobe.d -/usr/share/initramfs-tools/conf-hooks.d /etc/OpenCL/vendors /etc/xdg/autostart /usr/bin @@ -15,7 +14,6 @@ /usr/share/man/man1 /usr/share/pixmaps /usr/share/lintian/overrides -/usr/share/grub-gfxpayload-lists/blacklist /usr/lib/nvidia-current/xorg /usr/lib/nvidia-current/xorg /usr/src/nvidia-current-280.13 diff -u nvidia-graphics-drivers-280.13/debian/rules nvidia-graphics-drivers-280.13/debian/rules --- nvidia-graphics-drivers-280.13/debian/rules +++ nvidia-graphics-drivers-280.13/debian/rules @@ -89,7 +89,6 @@ tlsdir := $(libdir)/tls vdpaudir32 := $(libdir32)/vdpau tlsdir32 := $(libdir32)/tls -grub_blacklistdir := /usr/share/grub-gfxpayload-lists/blacklist # This is a hack to make sure that # the blacklist file is available @@ -116,16 +115,8 @@ blacklist nvidia-173-updates blacklist nvidia-96-updates alias nvidia $(PKG_module) -endef - -define initramfs_hook -# This file was installed by $(PKG_driver) -# Do not edit this file manually - -# Make sure that open graphics drivers are not loaded in -# the initramfs, or $(PKG_driver) will not work -# See LP: #839524 -FRAMEBUFFER=n +alias nouveau off +alias lbm-nouveau off endef # -Xlib32 @@ -207,7 +198,6 @@ -e "s|#PKGTLSDIR#|$(PKG_tlsdir)|g" \ -e "s|#PKGTLSDIR32#|$(PKG_tlsdir32)|g" \ -e "s|#PKGLIBCONFDIR#|$(PKG_libconfdir)|g" \ - -e "s|#GRUBBLKLISTDIR#|$(grub_blacklistdir)|g" \ -e "s|#DEB_HOST_MULTIARCH#|$(DEB_HOST_MULTIARCH)|g" \ -e "s|#OTHER_ARCH#|$(OTHER_ARCH)|g" \ debian/$$i.in > debian/$$i; \ @@ -315,10 +305,6 @@ # and create an alias for the module so that it can be used as nvidia printf '$(subst $(newline),\n,${blacklist_file})' > $(CURDIR)/debian/$(PKG_driver)$(PKG_libconfdir)/modprobe.conf - # Add an initramfs hook to make sure that nothing else loads open drivers in the initramfs - # See LP: #839524 - printf '$(subst $(newline),\n,${initramfs_hook})' > $(CURDIR)/debian/$(PKG_driver)$(PKG_libconfdir)/initramfs-hook - # XvMCConfig dh_installdirs -p$(PKG_driver) "$(PKG_configdir)" echo "libXvMCNVIDIA_dynamic.so.1" > $(CURDIR)/debian/$(PKG_driver)/$(PKG_configdir)/XvMCConfig diff -u nvidia-graphics-drivers-280.13/debian/nvidia-current.postinst.in nvidia-graphics-drivers-280.13/debian/nvidia-current.postinst.in --- nvidia-graphics-drivers-280.13/debian/nvidia-current.postinst.in +++ nvidia-graphics-drivers-280.13/debian/nvidia-current.postinst.in @@ -140,13 +140,11 @@ --slave #LIBDIR32#/libOpenCL.so #DEB_HOST_MULTIARCH#_libOpenCL.so_lib32 #PKGLIBDIR32#/libOpenCL.so \ --slave #LIBDIR#/xorg/modules/drivers/nvidia_drv.so #DEB_HOST_MULTIARCH#_nvidia_drv #PKGDRIVERSDIR#/nvidia_drv.so \ --slave #SYSCONFDIR#/modprobe.d/nvidia-graphics-drivers.conf #DEB_HOST_MULTIARCH#_nvidia_modconf #PKGLIBCONFDIR#/modprobe.conf \ - --slave #DATADIR#/initramfs-tools/conf-hooks.d/proprietary-graphics-drivers #DEB_HOST_MULTIARCH#_initramfs-hook #PKGLIBCONFDIR#/initramfs-hook \ --slave #XORGEXTRA# #DEB_HOST_MULTIARCH#_xorg_extra_modules #NVIDIAEXTENSION# \ --slave #VDPAUDIR#/libvdpau_nvidia.so.1 #DEB_HOST_MULTIARCH#_libvdpau_nvidia.so.1 #PKGVDPAUDIR#/libvdpau_nvidia.so.1 \ --slave #LIBDIR#/libvdpau_nvidia.so #DEB_HOST_MULTIARCH#_libvdpau_nvidia.so #PKGVDPAUDIR#/libvdpau_nvidia.so \ --slave #VDPAUDIR32#/libvdpau_nvidia.so.1 #DEB_HOST_MULTIARCH#_libvdpau_nvidia.so.1_lib32 #PKGVDPAUDIR32#/libvdpau_nvidia.so.1 \ --slave #LIBDIR32#/libvdpau_nvidia.so #DEB_HOST_MULTIARCH#_libvdpau_nvidia.so_lib32 #PKGVDPAUDIR32#/libvdpau_nvidia.so \ - --slave #GRUBBLKLISTDIR#/10_proprietary-graphics-drivers #DEB_HOST_MULTIARCH#_grub_fb_blacklist #PKGDATADIR#/#DRIVERNAME#.grub-gfxpayload # Install just the ld.so.conf.d alternative for the secondary architecture. # We need only to ensure that any mesa ld.so.conf.d alternative isn't active. @@ -157,6 +155,16 @@ # alternatives. LDCONFIG_NOTRIGGER=y ldconfig + case $2 in + 280.13-0ubuntu4|173.14.30-0ubuntu7|173.14.30-0ubuntu4|96.43.20-0ubuntu5|96.43.20-0ubuntu4) + # Clean up the grub gfxpayload when upgrading from + # the broken versions + if which update-grub-gfxpayload >/dev/null 2>&1; then + update-grub-gfxpayload + fi + ;; + esac + # Trigger gmenu so that the icons will show up in the menu dpkg-trigger --by-package=$PACKAGE_NAME gmenucache || true @@ -174,11 +182,6 @@ fi fi - # Update the grub gfxpayload blacklist - if which update-grub-gfxpayload >/dev/null 2>&1; then - update-grub-gfxpayload - fi - # If the delayed module build feature is enabled # i.e. if $DONT_BUILD_MODULE is set to 1 # or if $TMP_FILE exists diff -u nvidia-graphics-drivers-280.13/debian/nvidia-current.postinst nvidia-graphics-drivers-280.13/debian/nvidia-current.postinst --- nvidia-graphics-drivers-280.13/debian/nvidia-current.postinst +++ nvidia-graphics-drivers-280.13/debian/nvidia-current.postinst @@ -140,13 +140,11 @@ --slave /usr/lib32/libOpenCL.so x86_64-linux-gnu_libOpenCL.so_lib32 /usr/lib32/nvidia-current/libOpenCL.so \ --slave /usr/lib/xorg/modules/drivers/nvidia_drv.so x86_64-linux-gnu_nvidia_drv /usr/lib/nvidia-current/xorg/nvidia_drv.so \ --slave /etc/modprobe.d/nvidia-graphics-drivers.conf x86_64-linux-gnu_nvidia_modconf /lib/nvidia-current/modprobe.conf \ - --slave /usr/share/initramfs-tools/conf-hooks.d/proprietary-graphics-drivers x86_64-linux-gnu_initramfs-hook /lib/nvidia-current/initramfs-hook \ --slave /usr/lib/x86_64-linux-gnu/xorg/extra-modules x86_64-linux-gnu_xorg_extra_modules /usr/lib/nvidia-current/xorg \ --slave /usr/lib/vdpau/libvdpau_nvidia.so.1 x86_64-linux-gnu_libvdpau_nvidia.so.1 /usr/lib/nvidia-current/vdpau/libvdpau_nvidia.so.1 \ --slave /usr/lib/libvdpau_nvidia.so x86_64-linux-gnu_libvdpau_nvidia.so /usr/lib/nvidia-current/vdpau/libvdpau_nvidia.so \ --slave /usr/lib32/vdpau/libvdpau_nvidia.so.1 x86_64-linux-gnu_libvdpau_nvidia.so.1_lib32 /usr/lib32/nvidia-current/vdpau/libvdpau_nvidia.so.1 \ --slave /usr/lib32/libvdpau_nvidia.so x86_64-linux-gnu_libvdpau_nvidia.so_lib32 /usr/lib32/nvidia-current/vdpau/libvdpau_nvidia.so \ - --slave /usr/share/grub-gfxpayload-lists/blacklist/10_proprietary-graphics-drivers x86_64-linux-gnu_grub_fb_blacklist /usr/share/nvidia-current/nvidia-current.grub-gfxpayload # Install just the ld.so.conf.d alternative for the secondary architecture. # We need only to ensure that any mesa ld.so.conf.d alternative isn't active. @@ -157,6 +155,16 @@ # alternatives. LDCONFIG_NOTRIGGER=y ldconfig + case $2 in + 280.13-0ubuntu4|173.14.30-0ubuntu7|173.14.30-0ubuntu4|96.43.20-0ubuntu5|96.43.20-0ubuntu4) + # Clean up the grub gfxpayload when upgrading from + # the broken versions + if which update-grub-gfxpayload >/dev/null 2>&1; then + update-grub-gfxpayload + fi + ;; + esac + # Trigger gmenu so that the icons will show up in the menu dpkg-trigger --by-package=$PACKAGE_NAME gmenucache || true @@ -174,11 +182,6 @@ fi fi - # Update the grub gfxpayload blacklist - if which update-grub-gfxpayload >/dev/null 2>&1; then - update-grub-gfxpayload - fi - # If the delayed module build feature is enabled # i.e. if $DONT_BUILD_MODULE is set to 1 # or if $TMP_FILE exists