[PATCH 2/2 F][SRU][oem-5.6][L-R-M] UBUNTU: [Packaging] NVIDIA -- Add the 455 driver

[Alberto Milone]

Add the 455 series.

BugLink: https://bugs.launchpad.net/bugs/1902093

Signed-off-by: Alberto Milone <alberto.milone at canonical.com>
---
 debian/control.d/meta-nvidia | 10 ++++++++++
 debian/control.d/nvidia      | 14 ++++++++++++++
 debian/dkms-versions         |  1 +
 debian/rules                 |  6 ++++++
 4 files changed, 31 insertions(+)

diff --git a/debian/control.d/meta-nvidia b/debian/control.d/meta-nvidia
index 509c366..631bd87 100644
--- a/debian/control.d/meta-nvidia
+++ b/debian/control.d/meta-nvidia
@@ -7,3 +7,13 @@ Depends: ${misc:Depends}, linux-modules-nvidia-450-ABI-oem (= ${binary:Version})
  ${nvk:nvidia-450}
 Description: Extra drivers for nvidia-450 for the OEM flavour
  Install extra signed nvidia-450 modules compatible with the OEM flavour.
+
+Package: linux-modules-nvidia-455${variant:suffix}
+Build-Profiles: <!stage1>
+Architecture: amd64
+Section: kernel
+Provides: ${dkms:nvidia-455-modules}, nvidia-prebuilt-kernel
+Depends: ${misc:Depends}, linux-modules-nvidia-455-ABI-oem (= ${binary:Version}),
+ ${nvk:nvidia-455}
+Description: Extra drivers for nvidia-455 for the OEM flavour
+ Install extra signed nvidia-455 modules compatible with the OEM flavour.
diff --git a/debian/control.d/nvidia b/debian/control.d/nvidia
index b0dd828..73cc6e0 100644
--- a/debian/control.d/nvidia
+++ b/debian/control.d/nvidia
@@ -11,3 +11,17 @@ Description: Linux kernel nvidia modules for version ABI
  You likely do not want to install this package directly. Instead, install the
  linux-image-nvidia-FLAVOUR meta-package, which will ensure that upgrades work
  correctly, and that supporting packages are also installed.
+
+Package: linux-modules-nvidia-455-ABI-oem
+Build-Profiles: <!stage1>
+Architecture: amd64
+Section: kernel
+Priority: optional
+Built-Using: ${linux:BuiltUsing}
+Depends: ${misc:Depends}, ${shlibs:Depends}, binutils, linux-image-ABI-oem | linux-image-unsigned-ABI-oem
+Description: Linux kernel nvidia modules for version ABI
+ This package contains the Linux kernel nvidia modules for version ABI.
+ .
+ You likely do not want to install this package directly. Instead, install the
+ linux-image-nvidia-FLAVOUR meta-package, which will ensure that upgrades work
+ correctly, and that supporting packages are also installed.
diff --git a/debian/dkms-versions b/debian/dkms-versions
index 3acf966..d625db4 100644
--- a/debian/dkms-versions
+++ b/debian/dkms-versions
@@ -1,3 +1,4 @@
 zfs-linux 0.8.3-1ubuntu12.4
 nvidia-graphics-drivers-450 450.66-0ubuntu0.20.04.1
+nvidia-graphics-drivers-455 0
 virtualbox 6.1.10-dfsg-1~ubuntu1.20.04.1
diff --git a/debian/rules b/debian/rules
index 5fe08ba..607a446 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,8 +17,10 @@ series = $(shell dpkg-parsechangelog | sed -ne 's/^Distribution: *//p' | sed -e
 VARIANT_PROVIDES=$(shell echo "$(src_package)" | sed -e 's/linux-restricted-modules-//')
 
 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)
 
 nvidia_450_upstream_version=$(shell echo "$(dkms_nvidia_450_version)" | cut -d '-' -f 1)
+nvidia_455_upstream_version=$(shell echo "$(dkms_nvidia_455_version)" | cut -d '-' -f 1)
 
 # Get variants, assumng primary if debian/variants is not present
 variants = --
@@ -129,6 +131,8 @@ nvidia-%:
 	install -d debian/linux-modules-nvidia-450-$(src_abi)-$*/usr/lib/linux/triggers
 	$(call build_dkms, $(src_abi)-$*, linux-modules-nvidia-450-$(src_abi)-$*, $(CURDIR)/debian/linux-modules-nvidia-450-$(src_abi)-$*/lib/modules/$(src_abi)-$*/kernel, "", 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 install_control,linux-modules-nvidia-450-$(src_abi)-$*,$*,nvidia,450,postinst postrm prerm config templates)
+	$(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)
 
 prepare-dkms:
 	mkdir -p $(dkms_dir)
@@ -138,8 +142,10 @@ override_dh_auto_install: prepare-dkms $(flavours)
 	dh_install
 
 gencontrol_flags += -Vdkms:nvidia-450-modules="nvidia-dkms-450 (= $(dkms_nvidia_450_version))"
+gencontrol_flags += -Vdkms:nvidia-455-modules="nvidia-dkms-455 (= $(dkms_nvidia_455_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-455="nvidia-kernel-common-455 (<= $(nvidia_455_upstream_version)-1), nvidia-kernel-common-455 (>= $(nvidia_455_upstream_version))"
 
 override_dh_gencontrol:
 	dh_gencontrol -- $(gencontrol_flags)
-- 
2.25.1