| Message ID | 20200224155823.3167-1-alberto.milone@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/1] UBUNTU: [Packaging] NVIDIA -- add support for the 435 and the 440 series | expand |
Hi all, Sorry about lack of description, this is meant to be applied to the master-next branch of linux in Bionic. On Mon, 24 Feb 2020 at 16:58, <alberto.milone@canonical.com> wrote: > From: Alberto Milone <alberto.milone@canonical.com> > > BugLink: https://bugs.launchpad.net/bugs/1854485 > > Signed-off-by: Alberto Milone <alberto.milone@canonical.com> > --- > debian/dkms-versions | 2 ++ > debian/rules | 4 +++- > debian/rules.d/2-binary-arch.mk | 4 +++- > 3 files changed, 8 insertions(+), 2 deletions(-) > > diff --git a/debian/dkms-versions b/debian/dkms-versions > index 274a3bbd3841..44e43c1ae99c 100644 > --- a/debian/dkms-versions > +++ b/debian/dkms-versions > @@ -1,3 +1,5 @@ > spl-linux 0.7.5-1ubuntu2 > zfs-linux 0.7.5-1ubuntu16.7 > nvidia-graphics-drivers-390 390.116-0ubuntu0.18.04.3 > +nvidia-graphics-drivers-435 0 > +nvidia-graphics-drivers-440 0 > diff --git a/debian/rules b/debian/rules > index 4a4707637867..f732ba6f698d 100755 > --- a/debian/rules > +++ b/debian/rules > @@ -105,7 +105,9 @@ 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_435_version=$(shell gawk '/^nvidia-graphics-drivers-435/ { > print $$2; }' debian/dkms-versions) > +dkms_nvidia_440_version=$(shell gawk '/^nvidia-graphics-drivers-440/ { > 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 2485a175ce52..0e2b48d4ce5b 100644 > --- a/debian/rules.d/2-binary-arch.mk > +++ b/debian/rules.d/2-binary-arch.mk > @@ -402,7 +402,9 @@ 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-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-440, > pool/restricted/n/nvidia-graphics-drivers-440/nvidia-kernel-source-440_$(dkms_nvidia_440_version)_$(arch).deb > pool/restricted/n/nvidia-graphics-drivers-440/nvidia-dkms-440_$(dkms_nvidia_440_version)_$(arch).deb) > endif > > # Build the final ABI information. > -- > 2.20.1 > >
On 24.02.20 16:58, alberto.milone@canonical.com wrote: > From: Alberto Milone <alberto.milone@canonical.com> > > BugLink: https://bugs.launchpad.net/bugs/1854485 > > Signed-off-by: Alberto Milone <alberto.milone@canonical.com> For Bionic: Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com> > --- > debian/dkms-versions | 2 ++ > debian/rules | 4 +++- > debian/rules.d/2-binary-arch.mk | 4 +++- > 3 files changed, 8 insertions(+), 2 deletions(-) > > diff --git a/debian/dkms-versions b/debian/dkms-versions > index 274a3bbd3841..44e43c1ae99c 100644 > --- a/debian/dkms-versions > +++ b/debian/dkms-versions > @@ -1,3 +1,5 @@ > spl-linux 0.7.5-1ubuntu2 > zfs-linux 0.7.5-1ubuntu16.7 > nvidia-graphics-drivers-390 390.116-0ubuntu0.18.04.3 > +nvidia-graphics-drivers-435 0 > +nvidia-graphics-drivers-440 0 > diff --git a/debian/rules b/debian/rules > index 4a4707637867..f732ba6f698d 100755 > --- a/debian/rules > +++ b/debian/rules > @@ -105,7 +105,9 @@ 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_435_version=$(shell gawk '/^nvidia-graphics-drivers-435/ { print $$2; }' debian/dkms-versions) > +dkms_nvidia_440_version=$(shell gawk '/^nvidia-graphics-drivers-440/ { 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 2485a175ce52..0e2b48d4ce5b 100644 > --- a/debian/rules.d/2-binary-arch.mk > +++ b/debian/rules.d/2-binary-arch.mk > @@ -402,7 +402,9 @@ 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-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-440, pool/restricted/n/nvidia-graphics-drivers-440/nvidia-kernel-source-440_$(dkms_nvidia_440_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-440/nvidia-dkms-440_$(dkms_nvidia_440_version)_$(arch).deb) > endif > > # Build the final ABI information. >
Hi Alberto, To fully support the new drivers, we also need the changes to build them on the l-r-m package. Are you going to send those patches as well? Thanks, Kleber On 24.02.20 16:58, alberto.milone@canonical.com wrote: > From: Alberto Milone <alberto.milone@canonical.com> > > BugLink: https://bugs.launchpad.net/bugs/1854485 > > Signed-off-by: Alberto Milone <alberto.milone@canonical.com> > --- > debian/dkms-versions | 2 ++ > debian/rules | 4 +++- > debian/rules.d/2-binary-arch.mk | 4 +++- > 3 files changed, 8 insertions(+), 2 deletions(-) > > diff --git a/debian/dkms-versions b/debian/dkms-versions > index 274a3bbd3841..44e43c1ae99c 100644 > --- a/debian/dkms-versions > +++ b/debian/dkms-versions > @@ -1,3 +1,5 @@ > spl-linux 0.7.5-1ubuntu2 > zfs-linux 0.7.5-1ubuntu16.7 > nvidia-graphics-drivers-390 390.116-0ubuntu0.18.04.3 > +nvidia-graphics-drivers-435 0 > +nvidia-graphics-drivers-440 0 > diff --git a/debian/rules b/debian/rules > index 4a4707637867..f732ba6f698d 100755 > --- a/debian/rules > +++ b/debian/rules > @@ -105,7 +105,9 @@ 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_435_version=$(shell gawk '/^nvidia-graphics-drivers-435/ { print $$2; }' debian/dkms-versions) > +dkms_nvidia_440_version=$(shell gawk '/^nvidia-graphics-drivers-440/ { 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 2485a175ce52..0e2b48d4ce5b 100644 > --- a/debian/rules.d/2-binary-arch.mk > +++ b/debian/rules.d/2-binary-arch.mk > @@ -402,7 +402,9 @@ 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-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-440, pool/restricted/n/nvidia-graphics-drivers-440/nvidia-kernel-source-440_$(dkms_nvidia_440_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-440/nvidia-dkms-440_$(dkms_nvidia_440_version)_$(arch).deb) > endif > > # Build the final ABI information. >
Hi Kleber, The second patch that I sent in this thread is for the l-r-m (it says "Add support for multiple NVIDIA releases in the linux-restricted-modules." in the description). The first one is for the kernel. Thanks, On Tue, 25 Feb 2020 at 17:32, Kleber Souza <kleber.souza@canonical.com> wrote: > Hi Alberto, > > To fully support the new drivers, we also need the changes > to build them on the l-r-m package. Are you going to send > those patches as well? > > > Thanks, > Kleber > > > On 24.02.20 16:58, alberto.milone@canonical.com wrote: > > From: Alberto Milone <alberto.milone@canonical.com> > > > > BugLink: https://bugs.launchpad.net/bugs/1854485 > > > > Signed-off-by: Alberto Milone <alberto.milone@canonical.com> > > --- > > debian/dkms-versions | 2 ++ > > debian/rules | 4 +++- > > debian/rules.d/2-binary-arch.mk | 4 +++- > > 3 files changed, 8 insertions(+), 2 deletions(-) > > > > diff --git a/debian/dkms-versions b/debian/dkms-versions > > index 274a3bbd3841..44e43c1ae99c 100644 > > --- a/debian/dkms-versions > > +++ b/debian/dkms-versions > > @@ -1,3 +1,5 @@ > > spl-linux 0.7.5-1ubuntu2 > > zfs-linux 0.7.5-1ubuntu16.7 > > nvidia-graphics-drivers-390 390.116-0ubuntu0.18.04.3 > > +nvidia-graphics-drivers-435 0 > > +nvidia-graphics-drivers-440 0 > > diff --git a/debian/rules b/debian/rules > > index 4a4707637867..f732ba6f698d 100755 > > --- a/debian/rules > > +++ b/debian/rules > > @@ -105,7 +105,9 @@ 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_435_version=$(shell gawk '/^nvidia-graphics-drivers-435/ { > print $$2; }' debian/dkms-versions) > > +dkms_nvidia_440_version=$(shell gawk '/^nvidia-graphics-drivers-440/ { > 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 2485a175ce52..0e2b48d4ce5b 100644 > > --- a/debian/rules.d/2-binary-arch.mk > > +++ b/debian/rules.d/2-binary-arch.mk > > @@ -402,7 +402,9 @@ 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-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-440, > pool/restricted/n/nvidia-graphics-drivers-440/nvidia-kernel-source-440_$(dkms_nvidia_440_version)_$(arch).deb > pool/restricted/n/nvidia-graphics-drivers-440/nvidia-dkms-440_$(dkms_nvidia_440_version)_$(arch).deb) > > endif > > > > # Build the final ABI information. > > > >
On 24.02.20 16:58, alberto.milone@canonical.com wrote: > From: Alberto Milone <alberto.milone@canonical.com> > > BugLink: https://bugs.launchpad.net/bugs/1854485 > > Signed-off-by: Alberto Milone <alberto.milone@canonical.com> > --- I cannot see any other patch in this thread which I could take as the one meant for lrm, the bug has no task for the kernel (only lrm), and the subject of this patch does not allow decide which series this is meant for, nor does it tell whether kernel or lrm (one can guess but this is not the way this works). Please send this again (with all pieces clearly identified and under one thread). Thanks, Stefan > debian/dkms-versions | 2 ++ > debian/rules | 4 +++- > debian/rules.d/2-binary-arch.mk | 4 +++- > 3 files changed, 8 insertions(+), 2 deletions(-) > > diff --git a/debian/dkms-versions b/debian/dkms-versions > index 274a3bbd3841..44e43c1ae99c 100644 > --- a/debian/dkms-versions > +++ b/debian/dkms-versions > @@ -1,3 +1,5 @@ > spl-linux 0.7.5-1ubuntu2 > zfs-linux 0.7.5-1ubuntu16.7 > nvidia-graphics-drivers-390 390.116-0ubuntu0.18.04.3 > +nvidia-graphics-drivers-435 0 > +nvidia-graphics-drivers-440 0 > diff --git a/debian/rules b/debian/rules > index 4a4707637867..f732ba6f698d 100755 > --- a/debian/rules > +++ b/debian/rules > @@ -105,7 +105,9 @@ 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_435_version=$(shell gawk '/^nvidia-graphics-drivers-435/ { print $$2; }' debian/dkms-versions) > +dkms_nvidia_440_version=$(shell gawk '/^nvidia-graphics-drivers-440/ { 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 2485a175ce52..0e2b48d4ce5b 100644 > --- a/debian/rules.d/2-binary-arch.mk > +++ b/debian/rules.d/2-binary-arch.mk > @@ -402,7 +402,9 @@ 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-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-440, pool/restricted/n/nvidia-graphics-drivers-440/nvidia-kernel-source-440_$(dkms_nvidia_440_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-440/nvidia-dkms-440_$(dkms_nvidia_440_version)_$(arch).deb) > endif > > # Build the final ABI information. >
diff --git a/debian/dkms-versions b/debian/dkms-versions index 274a3bbd3841..44e43c1ae99c 100644 --- a/debian/dkms-versions +++ b/debian/dkms-versions @@ -1,3 +1,5 @@ spl-linux 0.7.5-1ubuntu2 zfs-linux 0.7.5-1ubuntu16.7 nvidia-graphics-drivers-390 390.116-0ubuntu0.18.04.3 +nvidia-graphics-drivers-435 0 +nvidia-graphics-drivers-440 0 diff --git a/debian/rules b/debian/rules index 4a4707637867..f732ba6f698d 100755 --- a/debian/rules +++ b/debian/rules @@ -105,7 +105,9 @@ 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_435_version=$(shell gawk '/^nvidia-graphics-drivers-435/ { print $$2; }' debian/dkms-versions) +dkms_nvidia_440_version=$(shell gawk '/^nvidia-graphics-drivers-440/ { 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 2485a175ce52..0e2b48d4ce5b 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -402,7 +402,9 @@ 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-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-440, pool/restricted/n/nvidia-graphics-drivers-440/nvidia-kernel-source-440_$(dkms_nvidia_440_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-440/nvidia-dkms-440_$(dkms_nvidia_440_version)_$(arch).deb) endif # Build the final ABI information.