reverted: --- nvidia-graphics-drivers-340-340.32/debian/69-nvidia-persistenced.rules +++ nvidia-graphics-drivers-340-340.32.orig/debian/69-nvidia-persistenced.rules @@ -1 +0,0 @@ -ACTION=="add" DEVPATH=="/module/bbswitch" SUBSYSTEM=="module" RUN+="/usr/bin/start-nvidia-persistenced" diff -u nvidia-graphics-drivers-340-340.32/debian/changelog nvidia-graphics-drivers-340-340.32/debian/changelog --- nvidia-graphics-drivers-340-340.32/debian/changelog +++ nvidia-graphics-drivers-340-340.32/debian/changelog @@ -1,8 +1,8 @@ -nvidia-graphics-drivers-340 (340.32-0ubuntu1~xedgers14.04.1) trusty; urgency=medium +nvidia-graphics-drivers-340 (340.32-0ubuntu1~xedgers14.04.2) trusty; urgency=medium * New upstream release - -- Rico Tzschichholz Tue, 12 Aug 2014 21:36:46 +0200 + -- Rico Tzschichholz Fri, 19 Sep 2014 21:25:57 +0200 nvidia-graphics-drivers-340 (340.24-0ubuntu1~xedgers14.10.1) utopic; urgency=medium @@ -13,6 +13,47 @@ -- Rico Tzschichholz Wed, 09 Jul 2014 07:50:21 +0200 +nvidia-graphics-drivers-331 (331.89-0ubuntu5) utopic; urgency=medium + + [ Graham Inggs ] + * debian/templates/control.in, + debian/templates/nvidia-graphics-drivers.shlibs.in: + - Add virtual packages for CUDA 6.0 (LP: #1346220). + * debian/rules: + - Make sure to install the files into -dev package (LP: #1335942). + + -- Alberto Milone Mon, 15 Sep 2014 10:34:42 +0200 + +nvidia-graphics-drivers-331 (331.89-0ubuntu4) utopic; urgency=medium + + [ Alberto Milone ] + * debian/71-nvidia.rules: + - Make the rule more generic. + + [ Graham Inggs ] + * debian/templates/control.in: + - Drop the recommends on nvidia-libopencl1-$flavour, + as nvidia-opencl-icd-$flavour already has its own + dependencies. + - Recommend the uvm driver instead of suggesting it. + - Create the 'nvidia-opencl-icd' and the 'nvidia-uvm' + virtual packages so that the real packages stop + trying to overwrite each other's files + (LP: #1328762, LP: #1347926). + + -- Alberto Milone Fri, 12 Sep 2014 16:34:08 +0200 + +nvidia-graphics-drivers-331 (331.89-0ubuntu3) utopic; urgency=medium + + * debian/71-nvidia.rules, debian/nvidia-persistenced.conf, + debian/start-nvidia-persistenced, debian/stop-nvidia-persistenced, + debian/templates/nvidia-graphics-drivers.install.in: + - Tag devices for logind (LP: #1365336). + - Start and stop nvidia-persistenced using udev rules. This + gets rid of the upstart job. + + -- Alberto Milone Fri, 05 Sep 2014 14:59:17 +0200 + nvidia-graphics-drivers-331 (331.89-0ubuntu2) utopic; urgency=medium * debian/substvars: diff -u nvidia-graphics-drivers-340-340.32/debian/control nvidia-graphics-drivers-340-340.32/debian/control --- nvidia-graphics-drivers-340-340.32/debian/control +++ nvidia-graphics-drivers-340-340.32/debian/control @@ -15,12 +15,11 @@ patch, acpid, lib32gcc1 [amd64], libc6-i386 [amd64], passwd, adduser, ${shlibs:Depends}, ${misc:Depends}, ${xviddriver:Depends} Recommends: nvidia-settings (>= 331.20), nvidia-prime (>= 0.5) | bumblebee, - libcuda1-340, nvidia-libopencl1-340, nvidia-opencl-icd-340 + libcuda1-340, nvidia-opencl-icd-340, nvidia-340-uvm Provides: xorg-driver-binary, nvidia-driver-binary, nvidia-persistenced, ${xviddriver:Provides} Conflicts: xorg-driver-binary, nvidia-persistenced Replaces: xorg-driver-binary, nvidia-persistenced -Suggests: nvidia-340-uvm XB-Modaliases: ${modaliases} Description: NVIDIA binary driver - version 340.32 The binary driver provide optimized hardware acceleration of OpenGL @@ -49,9 +48,9 @@ Package: libcuda1-340 Architecture: i386 amd64 armhf Depends: ${shlibs:Depends}, ${misc:Depends} -Provides: libcuda-5.0-1, libcuda-5.5-1 -Breaks: libcuda-5.0-1, libcuda-5.5-1 -Replaces: libcuda-5.0-1, libcuda-5.5-1 +Provides: libcuda-5.0-1, libcuda-5.5-1, libcuda-6.0-1 +Breaks: libcuda-5.0-1, libcuda-5.5-1, libcuda-6.0-1 +Replaces: libcuda-5.0-1, libcuda-5.5-1, libcuda-6.0-1 Description: NVIDIA CUDA runtime library The Compute Unified Device Architecture (CUDA) enables NVIDIA graphics processing units (GPUs) to be used for massively parallel @@ -81,7 +80,9 @@ Architecture: i386 amd64 Depends: ${shlibs:Depends}, ${misc:Depends}, ocl-icd-libopencl1 | nvidia-libopencl1-340 Enhances: libopencl1 -Provides: opencl-icd +Conflicts: nvidia-opencl-icd +Replaces: nvidia-opencl-icd +Provides: nvidia-opencl-icd, opencl-icd Description: NVIDIA OpenCL ICD OpenCL (Open Computing Language) is a multivendor open standard for general-purpose parallel programming of heterogeneous systems that include @@ -93,6 +94,9 @@ Package: nvidia-340-uvm Architecture: i386 amd64 armhf Depends: ${misc:Depends}, nvidia-340 (>= 340.32) +Conflicts: nvidia-uvm +Replaces: nvidia-uvm +Provides: nvidia-uvm Description: NVIDIA Unified Memory kernel module This package contains the NVIDIA Unified Memory kernel module. diff -u nvidia-graphics-drivers-340-340.32/debian/nvidia-340.install nvidia-graphics-drivers-340-340.32/debian/nvidia-340.install --- nvidia-graphics-drivers-340-340.32/debian/nvidia-340.install +++ nvidia-graphics-drivers-340-340.32/debian/nvidia-340.install @@ -4,9 +4,9 @@ debian/glamor.conf /usr/share/nvidia-340 -debian/69-nvidia-persistenced.rules lib/udev/rules.d +debian/71-nvidia.rules lib/udev/rules.d debian/start-nvidia-persistenced usr/bin -debian/nvidia-persistenced.conf etc/init +debian/stop-nvidia-persistenced usr/bin NVIDIA-Linux-x86_64-340.32-no-compat32/nvidia_drv.so /usr/lib/nvidia-340/xorg NVIDIA-Linux-x86_64-340.32-no-compat32/libglx.so.340.32 /usr/lib/nvidia-340/xorg diff -u nvidia-graphics-drivers-340-340.32/debian/nvidia-340.shlibs nvidia-graphics-drivers-340-340.32/debian/nvidia-340.shlibs --- nvidia-graphics-drivers-340-340.32/debian/nvidia-340.shlibs +++ nvidia-graphics-drivers-340-340.32/debian/nvidia-340.shlibs @@ -1,0 +2 @@ +libcuda 1 libcuda-6.0-1 reverted: --- nvidia-graphics-drivers-340-340.32/debian/nvidia-persistenced.conf +++ nvidia-graphics-drivers-340-340.32.orig/debian/nvidia-persistenced.conf @@ -1,18 +0,0 @@ -# nvidia-persistenced - support for NVIDIA's persistence mode -# -# Start and stop nvidia-persistenced when it's convenient. -# This job takes into account hybrid graphics. - -description "NVIDIA Persistenced Daemon" -author "Alberto Milone " - -start on bbswitch-ready -stop on (runlevel [016] or nvidia-off) - -expect fork - -exec /usr/bin/nvidia-persistenced --user nvidia-persistenced - -post-stop script - rm -rf /var/run/nvidia-persistenced -end script diff -u nvidia-graphics-drivers-340-340.32/debian/rules nvidia-graphics-drivers-340-340.32/debian/rules --- nvidia-graphics-drivers-340-340.32/debian/rules +++ nvidia-graphics-drivers-340-340.32/debian/rules @@ -348,6 +348,7 @@ override_dh_install: gen-abi-substvars dh_install -p$(PKG_driver) + dh_install -p$(PKG_driver_dev) ifeq ($(DEB_BUILD_ARCH),amd64) #32 bit libraries on 64 bit dh_installdirs -p$(PKG_driver) "$(PKG_libdir32)" diff -u nvidia-graphics-drivers-340-340.32/debian/start-nvidia-persistenced nvidia-graphics-drivers-340-340.32/debian/start-nvidia-persistenced --- nvidia-graphics-drivers-340-340.32/debian/start-nvidia-persistenced +++ nvidia-graphics-drivers-340-340.32/debian/start-nvidia-persistenced @@ -2,4 +2,2 @@ -# Give bbswitch some time to load and perform its operations -sleep 10 -# Finally tell nvidia-persistenced it can start -/sbin/initctl emit bbswitch-ready +# Start nvidia-persistenced +exec /usr/bin/nvidia-persistenced --user nvidia-persistenced diff -u nvidia-graphics-drivers-340-340.32/debian/templates/control.in nvidia-graphics-drivers-340-340.32/debian/templates/control.in --- nvidia-graphics-drivers-340-340.32/debian/templates/control.in +++ nvidia-graphics-drivers-340-340.32/debian/templates/control.in @@ -15,12 +15,11 @@ patch, acpid, lib32gcc1 [amd64], libc6-i386 [amd64], passwd, adduser, ${shlibs:Depends}, ${misc:Depends}, ${xviddriver:Depends} Recommends: nvidia-settings (>= 331.20), nvidia-prime (>= 0.5) | bumblebee, - #LIBCUDA1#, #LIBOPENCL1#, #OPENCLICD# + #LIBCUDA1#, #OPENCLICD#, #DRIVERUVMNAME# Provides: xorg-driver-binary, nvidia-driver-binary, nvidia-persistenced, ${xviddriver:Provides} Conflicts: xorg-driver-binary, nvidia-persistenced Replaces: xorg-driver-binary, nvidia-persistenced -Suggests: #DRIVERUVMNAME# XB-Modaliases: ${modaliases} Description: NVIDIA binary driver - version #VERSION# The binary driver provide optimized hardware acceleration of OpenGL @@ -49,9 +48,9 @@ Package: #LIBCUDA1# Architecture: i386 amd64 armhf Depends: ${shlibs:Depends}, ${misc:Depends} -Provides: libcuda-5.0-1, libcuda-5.5-1 -Breaks: libcuda-5.0-1, libcuda-5.5-1 -Replaces: libcuda-5.0-1, libcuda-5.5-1 +Provides: libcuda-5.0-1, libcuda-5.5-1, libcuda-6.0-1 +Breaks: libcuda-5.0-1, libcuda-5.5-1, libcuda-6.0-1 +Replaces: libcuda-5.0-1, libcuda-5.5-1, libcuda-6.0-1 Description: NVIDIA CUDA runtime library The Compute Unified Device Architecture (CUDA) enables NVIDIA graphics processing units (GPUs) to be used for massively parallel @@ -81,7 +80,9 @@ Architecture: i386 amd64 Depends: ${shlibs:Depends}, ${misc:Depends}, ocl-icd-libopencl1 | #LIBOPENCL1# Enhances: libopencl1 -Provides: opencl-icd +Conflicts: nvidia-opencl-icd +Replaces: nvidia-opencl-icd +Provides: nvidia-opencl-icd, opencl-icd Description: NVIDIA OpenCL ICD OpenCL (Open Computing Language) is a multivendor open standard for general-purpose parallel programming of heterogeneous systems that include @@ -93,6 +94,9 @@ Package: #DRIVERUVMNAME# Architecture: i386 amd64 armhf Depends: ${misc:Depends}, #DRIVERNAME# (>= #VERSION#) +Conflicts: nvidia-uvm +Replaces: nvidia-uvm +Provides: nvidia-uvm Description: NVIDIA Unified Memory kernel module This package contains the NVIDIA Unified Memory kernel module. diff -u nvidia-graphics-drivers-340-340.32/debian/templates/nvidia-graphics-drivers.install.in nvidia-graphics-drivers-340-340.32/debian/templates/nvidia-graphics-drivers.install.in --- nvidia-graphics-drivers-340-340.32/debian/templates/nvidia-graphics-drivers.install.in +++ nvidia-graphics-drivers-340-340.32/debian/templates/nvidia-graphics-drivers.install.in @@ -4,9 +4,9 @@ debian/glamor.conf #PKGDATADIR# -debian/69-nvidia-persistenced.rules lib/udev/rules.d +debian/71-nvidia.rules lib/udev/rules.d debian/start-nvidia-persistenced usr/bin -debian/nvidia-persistenced.conf etc/init +debian/stop-nvidia-persistenced usr/bin #DIRNAME#/nvidia_drv.so #PKGDRIVERSDIR# #DIRNAME#/libglx.so.#VERSION# #NVIDIAEXTENSION# diff -u nvidia-graphics-drivers-340-340.32/debian/templates/nvidia-graphics-drivers.shlibs.in nvidia-graphics-drivers-340-340.32/debian/templates/nvidia-graphics-drivers.shlibs.in --- nvidia-graphics-drivers-340-340.32/debian/templates/nvidia-graphics-drivers.shlibs.in +++ nvidia-graphics-drivers-340-340.32/debian/templates/nvidia-graphics-drivers.shlibs.in @@ -1,0 +2 @@ +libcuda 1 libcuda-6.0-1 only in patch2: unchanged: --- nvidia-graphics-drivers-340-340.32.orig/debian/71-nvidia.rules +++ nvidia-graphics-drivers-340-340.32/debian/71-nvidia.rules @@ -0,0 +1,14 @@ +# Tag the device as master-of-seat so that logind is happy +# (see LP: #1365336) +SUBSYSTEM=="pci", ATTRS{vendor}=="0x10de", DRIVERS=="nvidia", TAG+="seat", TAG+="master-of-seat" + +# Start and stop nvidia-persistenced on power on and power off +# respectively +ACTION=="add" DEVPATH=="/bus/acpi/drivers/NVIDIA ACPI Video Driver" SUBSYSTEM=="drivers" RUN+="/usr/bin/start-nvidia-persistenced" +ACTION=="remove" DEVPATH=="/bus/acpi/drivers/NVIDIA ACPI Video Driver" SUBSYSTEM=="drivers" RUN+="/usr/bin/stop-nvidia-persistenced" + +# Start and stop nvidia-persistenced when loading and unloading +# the driver +ACTION=="add" DEVPATH=="/module/nvidia" SUBSYSTEM=="module" RUN+="/usr/bin/start-nvidia-persistenced" +ACTION=="remove" DEVPATH=="/module/nvidia" SUBSYSTEM=="module" RUN+="/usr/bin/stop-nvidia-persistenced" + only in patch2: unchanged: --- nvidia-graphics-drivers-340-340.32.orig/debian/stop-nvidia-persistenced +++ nvidia-graphics-drivers-340-340.32/debian/stop-nvidia-persistenced @@ -0,0 +1,4 @@ +#!/bin/sh +# Stop nvidia-persistenced +killall nvidia-persistenced || true +rm -rf /var/run/nvidia-persistenced