diff mbox series

[2/2,linux,SRU,Disco] UBUNTU: add nvidia-418 dkms build

Message ID 20190627125817.28904-3-seth.forshee@canonical.com
State New
Headers show
Series [1/2,linux,SRU,Disco] UBUNTU: [Packaging] dkms-build--nvidia-N -- clean up unsigned ko files | expand

Commit Message

Seth Forshee June 27, 2019, 12:58 p.m. UTC 
BugLink: https://bugs.launchpad.net/bugs/1834476
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
---
 debian/dkms-versions            | 1 +
 debian/rules                    | 3 ++-
 debian/rules.d/2-binary-arch.mk | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/debian/dkms-versions b/debian/dkms-versions
index 425f222418c7..0cf63c43e68b 100644
--- a/debian/dkms-versions
+++ b/debian/dkms-versions
@@ -1,3 +1,4 @@ 
 spl-linux 0.7.12-1ubuntu3
 zfs-linux 0.7.12-1ubuntu5
 nvidia-graphics-drivers-390 390.116-0ubuntu1
+nvidia-graphics-drivers-418 418.56-0ubuntu1
diff --git a/debian/rules b/debian/rules
index d96cae4bee73..02974188f7a4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -106,7 +106,8 @@  endif
 # Versions of dkms packages.
 dkms_zfs_linux_version=$(shell gawk '/^zfs-linux / { print $$2; }' debian/dkms-versions)
 dkms_spl_linux_version=$(shell gawk '/^spl-linux / { print $$2; }' debian/dkms-versions)
-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)
 
 # Debian Build System targets
 binary: binary-indep binary-arch
diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index b04c855f3cd8..81092c0d56ac 100644
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -400,7 +400,8 @@  endif
 	$(if $(filter true,$(enable_zfs)),$(call build_dkms, $(mods_pkg_name)-$*, $(pkgdir)/lib/modules/$(abi_release)-$*/kernel, zfs, pool/universe/z/zfs-linux/zfs-dkms_$(dkms_zfs_linux_version)_all.deb))
 
 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_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-390/nvidia-dkms-390_$(dkms_nvidia_version)_$(arch).deb)
+	$(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-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)
 endif
 
 	# Build the final ABI information.