UBUNTU: [Packaging] Remove nvidia-435 dkms build

The l-r-m packages for nvidia-435 are now transitionals, so we
don't need to build the modules anymore.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/debian/dkms-versions b/debian/dkms-versions
index 3bc50e4667f3b8e74529e8acfcb7700faf9323be..79e3e43bc5f877b6afc63c7f444ca9268fdcd102 100644 (file)
--- a/debian/dkms-versions
+++ b/debian/dkms-versions
@@ -1,6 +1,5 @@
 zfs-linux 0.8.4-1ubuntu15
 nvidia-graphics-drivers-390 390.138-0ubuntu2
-nvidia-graphics-drivers-435 435.21-0ubuntu8
 nvidia-graphics-drivers-450 450.80.02-0ubuntu1
 nvidia-graphics-drivers-455 0
 nvidia-graphics-drivers-418-server 418.152.00-0ubuntu2

diff --git a/debian/rules b/debian/rules
index 6b7f2060e9a1b860b9a017983eff7bb766f9cbb8..0da7ad3e293106f55224e483d257d4bd7ae1e591 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -118,7 +118,6 @@ do_any_tools=$(sort $(filter-out false,$(do_linux_tools) $(do_cloud_tools)))
 # Versions of dkms packages.
 dkms_zfs_linux_version=$(shell gawk '/^zfs-linux / { print $$2; }' debian/dkms-versions)
 dkms_nvidia_390_version=$(shell gawk '/^nvidia-graphics-drivers-390 / { print $$2; }' debian/dkms-versions)
-dkms_nvidia_435_version=$(shell gawk '/^nvidia-graphics-drivers-435 / { print $$2; }' debian/dkms-versions)
 dkms_nvidia_450_version=$(shell gawk '/^nvidia-graphics-drivers-450 / { print $$2; }' debian/dkms-versions)
 dkms_nvidia_455_version=$(shell gawk '/^nvidia-graphics-drivers-455 / { print $$2; }' debian/dkms-versions)
 dkms_nvidia_418_server_version=$(shell gawk '/^nvidia-graphics-drivers-418-server / { print $$2; }' debian/dkms-versions)

diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index a539511acae3b740d0f6b03e3337130e4ea84ebf..e72a9755ad47b492fe63aeda998de602d1744ad5 100644 (file)
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -404,7 +404,6 @@ endif
 
 ifeq ($(do_dkms_nvidia),true)
        $(call build_dkms, $(bldinfo_pkg_name)-$*, $(pkgdir_bldinfo)/usr/lib/linux/$(abi_release)-$*/signatures, "", nvidia-390, pool/restricted/n/nvidia-graphics-drivers-390/nvidia-kernel-source-390_$(dkms_nvidia_390_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-390/nvidia-dkms-390_$(dkms_nvidia_390_version)_$(arch).deb)
-       $(call build_dkms, $(bldinfo_pkg_name)-$*, $(pkgdir_bldinfo)/usr/lib/linux/$(abi_release)-$*/signatures, "", nvidia-435, pool/restricted/n/nvidia-graphics-drivers-435/nvidia-kernel-source-435_$(dkms_nvidia_435_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-435/nvidia-dkms-435_$(dkms_nvidia_435_version)_$(arch).deb)
        $(call build_dkms, $(bldinfo_pkg_name)-$*, $(pkgdir_bldinfo)/usr/lib/linux/$(abi_release)-$*/signatures, "", nvidia-450, pool/restricted/n/nvidia-graphics-drivers-450/nvidia-kernel-source-450_$(dkms_nvidia_450_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-450/nvidia-dkms-450_$(dkms_nvidia_450_version)_$(arch).deb)
        $(call build_dkms, $(bldinfo_pkg_name)-$*, $(pkgdir_bldinfo)/usr/lib/linux/$(abi_release)-$*/signatures, "", nvidia-455, pool/restricted/n/nvidia-graphics-drivers-455/nvidia-kernel-source-455_$(dkms_nvidia_455_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-455/nvidia-dkms-455_$(dkms_nvidia_455_version)_$(arch).deb)
 endif