[PATCH 1/1][linux-restricted-modules][SRU][Disco] UBUNTU: add support for nvidia-418

[Seth Forshee]

BugLink: https://bugs.launchpad.net/bugs/1834476
Signed-off-by: Seth Forshee <seth.forshee at canonical.com>
---
 debian/control.stub                 | 44 +++++++++++++++++++++++++++++
 debian/rules                        | 15 +++++++---
 debian/templates/nvidia.postinst.in |  2 +-
 debian/templates/nvidia.prerm.in    |  2 +-
 4 files changed, 57 insertions(+), 6 deletions(-)

diff --git a/debian/control.stub b/debian/control.stub
index b91b02376a2d..70b56d0ced4d 100644
--- a/debian/control.stub
+++ b/debian/control.stub
@@ -61,3 +61,47 @@ Section: kernel
 Depends: ${misc:Depends}, linux-modules-nvidia-390-ABI-lowlatency (= ${binary:Version})
 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-418-ABI-generic
+Build-Profiles: <!stage1>
+Architecture: amd64
+Section: kernel
+Priority: optional
+Built-Using: ${linux:BuiltUsing}
+Depends: ${misc:Depends}, ${shlibs:Depends}, binutils, linux-image-ABI-generic | linux-image-unsigned-ABI-generic, nvidia-kernel-common-418
+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.
+
+Package: linux-modules-nvidia-418-ABI-lowlatency
+Build-Profiles: <!stage1>
+Architecture: amd64
+Section: kernel
+Priority: optional
+Built-Using: ${linux:BuiltUsing}
+Depends: ${misc:Depends}, ${shlibs:Depends}, binutils, linux-image-ABI-lowlatency | linux-image-unsigned-ABI-lowlatency, nvidia-kernel-common-418
+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.
+
+Package: linux-modules-nvidia-418-generic
+Build-Profiles: <!stage1>
+Architecture: amd64
+Section: kernel
+Depends: ${misc:Depends}, linux-modules-nvidia-418-ABI-generic (= ${binary:Version})
+Description: Extra drivers for nvidia-418 for the generic flavour
+ Install extra signed nvidia-418 modules compatible with the generic flavour.
+
+Package: linux-modules-nvidia-418-lowlatency
+Build-Profiles: <!stage1>
+Architecture: amd64
+Section: kernel
+Depends: ${misc:Depends}, linux-modules-nvidia-418-ABI-lowlatency (= ${binary:Version})
+Description: Extra drivers for nvidia-418 for the lowlatency flavour
+ Install extra signed nvidia-418 modules compatible with the lowlatency flavour.
diff --git a/debian/rules b/debian/rules
index 0468f1bafe52..d0b41d8623b7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,8 @@ src_fullversion = $(shell LC_ALL=C dpkg-parsechangelog | grep ^Version: | cut -d
 src_abi = $(shell echo "$(src_fullversion)" | sed -ne 's/\([0-9]*\.[0-9]*\.[0-9]*\-[0-9]*\)\..*/\1/p')
 src_version = $(shell echo $(src_fullversion) | sed -e 's/+[0-9][0-9]*//')
 
-dkms_nvidia_version=$(shell gawk '/^nvidia-graphics-drivers-/ { print $$2; }' debian/dkms-versions)
+dkms_nvidia_390_version=$(shell gawk '/^nvidia-graphics-drivers-390/ { print $$2; }' debian/dkms-versions)
+dkms_nvidia_418_version=$(shell gawk '/^nvidia-graphics-drivers-418/ { print $$2; }' debian/dkms-versions)
 
 test:
 	echo "$(src_fullversion) $(src_version)"
@@ -67,13 +68,14 @@ instfile=vmlinuz
 endif
 
 define install_control =
-	for which in $(4);							\
+	for which in $(5);							\
 	do									\
 		template="debian/templates/$(3).$$which.in";			\
 		script="debian/$(1).$$which";					\
 		sed -e 's/@abiname@/$(src_abi)/g'				\
 		    -e 's/@localversion@/-$(2)/g'				\
 		    -e 's/@image-stem@/$(instfile)/g'				\
+		    -e 's/@nvidia-ver@/$(4)/g'					\
 			<"$$template" >"$$script";				\
 	done
 endef
@@ -86,8 +88,13 @@ nvidia-%:
 	mkdir -p $(dkms_dir)/build $(dkms_dir)/source
 	install -d debian/linux-modules-nvidia-390-$(src_abi)-$*
 	install -d debian/linux-modules-nvidia-390-$(src_abi)-$*/usr/lib/linux/triggers
-	$(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_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-390/nvidia-dkms-390_$(dkms_nvidia_version)_$(arch).deb)
-	$(call install_control,linux-modules-nvidia-390-$(src_abi)-$*,$*,nvidia,postinst postrm prerm config templates)
+	$(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-418-$(src_abi)-$*
+	install -d debian/linux-modules-nvidia-418-$(src_abi)-$*/usr/lib/linux/triggers
+	$(call build_dkms, $(src_abi)-$*, linux-modules-nvidia-418-$(src_abi)-$*, $(CURDIR)/debian/linux-modules-nvidia-418-$(src_abi)-$*/lib/modules/$(src_abi)-$*/kernel, nvidia-418, pool/restricted/n/nvidia-graphics-drivers-418/nvidia-kernel-source-418_$(dkms_nvidia_418_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-418/nvidia-dkms-418_$(dkms_nvidia_418_version)_$(arch).deb)
+	$(call install_control,linux-modules-nvidia-418-$(src_abi)-$*,$*,nvidia,418,postinst postrm prerm config templates)
 
 prepare-dkms:
 	mkdir -p $(dkms_dir)
diff --git a/debian/templates/nvidia.postinst.in b/debian/templates/nvidia.postinst.in
index 55644872aa94..607d72ac87e0 100755
--- a/debian/templates/nvidia.postinst.in
+++ b/debian/templates/nvidia.postinst.in
@@ -4,7 +4,7 @@ set -e
 version=@abiname@@localversion@
 image_path=/boot/@image-stem at -$version
 
-bits=/lib/modules/$version/kernel/nvidia-390/bits
+bits=/lib/modules/$version/kernel/nvidia- at nvidia-ver@/bits
 
 if [ "$1" != configure ]; then
     exit 0
diff --git a/debian/templates/nvidia.prerm.in b/debian/templates/nvidia.prerm.in
index 2855651a8786..f8b8e3e5a286 100755
--- a/debian/templates/nvidia.prerm.in
+++ b/debian/templates/nvidia.prerm.in
@@ -3,7 +3,7 @@ set -e
 
 version=@abiname@@localversion@
 
-bits=/lib/modules/$version/kernel/nvidia-390/bits
+bits=/lib/modules/$version/kernel/nvidia- at nvidia-ver@/bits
 
 if [ "$1" != remove ]; then
     exit 0
-- 
2.20.1