@@ -66,7 +66,7 @@ Depends: ${misc:Depends}, linux-modules-nvidia-390-ABI-lowlatency (= ${binary:Ve
Description: Extra drivers for nvidia-390 for the lowlatency flavour
Install extra signed nvidia-390 modules compatible with the lowlatency flavour.
-Package: linux-modules-nvidia-435-ABI-generic
+Package: linux-modules-nvidia-455-ABI-generic
Build-Profiles: <!stage1>
Architecture: amd64
Section: kernel
@@ -80,7 +80,7 @@ Description: Linux kernel nvidia modules for version ABI
linux-image-nvidia-FLAVOUR meta-package, which will ensure that upgrades work
correctly, and that supporting packages are also installed.
-Package: linux-modules-nvidia-435-ABI-lowlatency
+Package: linux-modules-nvidia-455-ABI-lowlatency
Build-Profiles: <!stage1>
Architecture: amd64
Section: kernel
@@ -94,25 +94,25 @@ Description: Linux kernel nvidia modules for version ABI
linux-image-nvidia-FLAVOUR meta-package, which will ensure that upgrades work
correctly, and that supporting packages are also installed.
-Package: linux-modules-nvidia-435-generic
+Package: linux-modules-nvidia-455-generic
Build-Profiles: <!stage1>
Architecture: amd64
Section: kernel
-Provides: ${dkms:nvidia-435-modules}, nvidia-prebuilt-kernel
-Depends: ${misc:Depends}, linux-modules-nvidia-435-ABI-generic (= ${binary:Version}),
- ${nvk:nvidia-435}
-Description: Extra drivers for nvidia-435 for the generic flavour
- Install extra signed nvidia-435 modules compatible with the generic flavour.
+Provides: ${dkms:nvidia-455-modules}, nvidia-prebuilt-kernel
+Depends: ${misc:Depends}, linux-modules-nvidia-455-ABI-generic (= ${binary:Version}),
+ ${nvk:nvidia-455}
+Description: Extra drivers for nvidia-455 for the generic flavour
+ Install extra signed nvidia-455 modules compatible with the generic flavour.
-Package: linux-modules-nvidia-435-lowlatency
+Package: linux-modules-nvidia-455-lowlatency
Build-Profiles: <!stage1>
Architecture: amd64
Section: kernel
-Provides: ${dkms:nvidia-435-modules}, nvidia-prebuilt-kernel
-Depends: ${misc:Depends}, linux-modules-nvidia-435-ABI-lowlatency (= ${binary:Version}),
- ${nvk:nvidia-435}
-Description: Extra drivers for nvidia-435 for the lowlatency flavour
- Install extra signed nvidia-435 modules compatible with the lowlatency flavour.
+Provides: ${dkms:nvidia-455-modules}, nvidia-prebuilt-kernel
+Depends: ${misc:Depends}, linux-modules-nvidia-455-ABI-lowlatency (= ${binary:Version}),
+ ${nvk:nvidia-455}
+Description: Extra drivers for nvidia-455 for the lowlatency flavour
+ Install extra signed nvidia-455 modules compatible with the lowlatency flavour.
Package: linux-modules-nvidia-450-ABI-generic
Build-Profiles: <!stage1>
@@ -319,3 +319,17 @@ Section: oldlibs
Depends: linux-modules-nvidia-450-lowlatency
Description: Extra drivers for nvidia-440 for the generic flavour (dummy transitional package)
Transitional package for upgrades of -440 to -450.
+
+Package: linux-modules-nvidia-435-generic
+Architecture: amd64
+Section: oldlibs
+Depends: linux-modules-nvidia-455-generic
+Description: Extra drivers for nvidia-435 for the generic flavour (dummy transitional package)
+ Transitional package for upgrades of -435 to -455.
+
+Package: linux-modules-nvidia-435-lowlatency
+Architecture: amd64
+Section: oldlibs
+Depends: linux-modules-nvidia-455-lowlatency
+Description: Extra drivers for nvidia-435 for the generic flavour (dummy transitional package)
+ Transitional package for upgrades of -435 to -455.
@@ -1,7 +1,7 @@
spl-linux 0.7.5-1ubuntu2.2
zfs-linux 0.7.5-1ubuntu16.10
nvidia-graphics-drivers-390 390.138-0ubuntu0.18.04.1
-nvidia-graphics-drivers-435 435.21-0ubuntu0.18.04.3
+nvidia-graphics-drivers-455 0
nvidia-graphics-drivers-450 450.80.02-0ubuntu0.18.04.2
nvidia-graphics-drivers-418-server 418.152.00-0ubuntu0.18.04.1
nvidia-graphics-drivers-440-server 440.95.01-0ubuntu0.18.04.1
@@ -14,14 +14,14 @@ src_abi = $(shell echo "$(src_fullversion)" | sed -ne 's/\([0-9]*\.[0-9]*\.[0-9]
src_version = $(shell echo $(src_fullversion) | sed -e 's/+[0-9][0-9]*//')
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_455_version=$(shell gawk '/^nvidia-graphics-drivers-455 / { print $$2; }' debian/dkms-versions)
dkms_nvidia_450_version=$(shell gawk '/^nvidia-graphics-drivers-450 / { print $$2; }' debian/dkms-versions)
dkms_nvidia_418_server_version=$(shell gawk '/^nvidia-graphics-drivers-418-server / { print $$2; }' debian/dkms-versions)
dkms_nvidia_440_server_version=$(shell gawk '/^nvidia-graphics-drivers-440-server / { print $$2; }' debian/dkms-versions)
dkms_nvidia_450_server_version=$(shell gawk '/^nvidia-graphics-drivers-450-server / { print $$2; }' debian/dkms-versions)
nvidia_390_upstream_version=$(shell echo "$(dkms_nvidia_390_version)" | cut -d '-' -f 1)
-nvidia_435_upstream_version=$(shell echo "$(dkms_nvidia_435_version)" | cut -d '-' -f 1)
+nvidia_455_upstream_version=$(shell echo "$(dkms_nvidia_455_version)" | cut -d '-' -f 1)
nvidia_450_upstream_version=$(shell echo "$(dkms_nvidia_450_version)" | cut -d '-' -f 1)
nvidia_418_server_upstream_version=$(shell echo "$(dkms_nvidia_418_server_version)" | cut -d '-' -f 1)
nvidia_440_server_upstream_version=$(shell echo "$(dkms_nvidia_440_server_version)" | cut -d '-' -f 1)
@@ -102,10 +102,10 @@ nvidia-%:
$(call build_dkms, $(src_abi)-$*, linux-modules-nvidia-390-$(src_abi)-$*, $(CURDIR)/debian/linux-modules-nvidia-390-$(src_abi)-$*/lib/modules/$(src_abi)-$*/kernel, 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 install_control,linux-modules-nvidia-390-$(src_abi)-$*,$*,nvidia,390,postinst postrm prerm config templates)
- install -d debian/linux-modules-nvidia-435-$(src_abi)-$*
- install -d debian/linux-modules-nvidia-435-$(src_abi)-$*/usr/lib/linux/triggers
- $(call build_dkms, $(src_abi)-$*, linux-modules-nvidia-435-$(src_abi)-$*, $(CURDIR)/debian/linux-modules-nvidia-435-$(src_abi)-$*/lib/modules/$(src_abi)-$*/kernel, 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 install_control,linux-modules-nvidia-435-$(src_abi)-$*,$*,nvidia,435,postinst postrm prerm config templates)
+ install -d debian/linux-modules-nvidia-455-$(src_abi)-$*
+ install -d debian/linux-modules-nvidia-455-$(src_abi)-$*/usr/lib/linux/triggers
+ $(call build_dkms, $(src_abi)-$*, linux-modules-nvidia-455-$(src_abi)-$*, $(CURDIR)/debian/linux-modules-nvidia-455-$(src_abi)-$*/lib/modules/$(src_abi)-$*/kernel, 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)
+ $(call install_control,linux-modules-nvidia-455-$(src_abi)-$*,$*,nvidia,455,postinst postrm prerm config templates)
install -d debian/linux-modules-nvidia-450-$(src_abi)-$*
install -d debian/linux-modules-nvidia-450-$(src_abi)-$*/usr/lib/linux/triggers
@@ -135,14 +135,14 @@ override_dh_auto_install: prepare-dkms $(flavours)
dh_install
gencontrol_flags = -Vdkms:nvidia-390-modules="nvidia-dkms-390 (= $(dkms_nvidia_390_version))"
-gencontrol_flags += -Vdkms:nvidia-435-modules="nvidia-dkms-435 (= $(dkms_nvidia_435_version))"
+gencontrol_flags += -Vdkms:nvidia-455-modules="nvidia-dkms-455 (= $(dkms_nvidia_455_version))"
gencontrol_flags += -Vdkms:nvidia-450-modules="nvidia-dkms-450 (= $(dkms_nvidia_450_version))"
gencontrol_flags += -Vdkms:nvidia-418-server-modules="nvidia-dkms-418-server (= $(dkms_nvidia_418_server_version))"
gencontrol_flags += -Vdkms:nvidia-440-server-modules="nvidia-dkms-440-server (= $(dkms_nvidia_440_server_version))"
gencontrol_flags += -Vdkms:nvidia-450-server-modules="nvidia-dkms-450-server (= $(dkms_nvidia_450_server_version))"
gencontrol_flags += -Vnvk:nvidia-390="nvidia-kernel-common-390 (<= $(nvidia_390_upstream_version)-1), nvidia-kernel-common-390 (>= $(nvidia_390_upstream_version))"
-gencontrol_flags += -Vnvk:nvidia-435="nvidia-kernel-common-435 (<= $(nvidia_435_upstream_version)-1), nvidia-kernel-common-435 (>= $(nvidia_435_upstream_version))"
+gencontrol_flags += -Vnvk:nvidia-455="nvidia-kernel-common-455 (<= $(nvidia_455_upstream_version)-1), nvidia-kernel-common-455 (>= $(nvidia_455_upstream_version))"
gencontrol_flags += -Vnvk:nvidia-450="nvidia-kernel-common-450 (<= $(nvidia_450_upstream_version)-1), nvidia-kernel-common-450 (>= $(nvidia_450_upstream_version))"
gencontrol_flags += -Vnvk:nvidia-418-server="nvidia-kernel-common-418-server (<= $(nvidia_418_server_upstream_version)-1), nvidia-kernel-common-418-server (>= $(nvidia_418_server_upstream_version))"
gencontrol_flags += -Vnvk:nvidia-440-server="nvidia-kernel-common-440-server (<= $(nvidia_440_server_upstream_version)-1), nvidia-kernel-common-440-server (>= $(nvidia_440_server_upstream_version))"
Add the 455 series, and drop the 435 series. BugLink: https://bugs.launchpad.net/bugs/1902093 Signed-off-by: Alberto Milone <alberto.milone@canonical.com> --- debian/control.stub | 42 ++++++++++++++++++++++++++++-------------- debian/dkms-versions | 2 +- debian/rules | 16 ++++++++-------- 3 files changed, 37 insertions(+), 23 deletions(-)