From patchwork Wed Nov 4 16:28:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Milone X-Patchwork-Id: 1394246 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CRBss6GfVz9sT6; Thu, 5 Nov 2020 03:28:33 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1kaLeA-0004lY-Gt; Wed, 04 Nov 2020 16:28:30 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kaLe8-0004lA-HN for kernel-team@lists.ubuntu.com; Wed, 04 Nov 2020 16:28:28 +0000 Received: from mail-wr1-f71.google.com ([209.85.221.71]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kaLe8-0006mr-8O for kernel-team@lists.ubuntu.com; Wed, 04 Nov 2020 16:28:28 +0000 Received: by mail-wr1-f71.google.com with SMTP id w3so7325372wrt.11 for ; Wed, 04 Nov 2020 08:28:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qOeywwsuEk1hzGkQovil77HkYo6XqVB1XguSpkEvXbE=; b=Lz98EyrGHTgE3wf0xkU2i4X1iR5SispIse4WtbJV+hhfBEN0fJjOIcsa0DlhMp7S8e loQLYARWCSmgWXSiZXBDYJrcKyeWaOouruuEqhNRqr9ix8Q4IwgHCehCHEC211827cp6 PEIX6Ke5LxxosBKYmmk66JhTEncMOc59Amscwdbzj+rUQpoUx9tZRKhHZRDqWdPmvhEX yRGO8Ht+Oro3oLV8ZWHSQyOEmVYxeEfY6u8p7eJ7pCYFwcXRmhMN4CaIDZvY4pBa6Vbn FgqDgNZSD4YbwRt+at7QRz1Abaru5YHbyIOVvsESCd9OfeBpaFPLPKbi+HDZfxp40mmH G0FA== X-Gm-Message-State: AOAM531tUgWA7+Zht/YiY8bOi42cWzOPn2Y20BGENEAOCaJ9IgVYwEXj rTw2dhnwsMrFVZ7ZqfGzTR5ZOrYEHMu5XmJAVeyMnH6/7VqSm8PNt1SyvDtOa9xJmwTo6o+vhFj arn/jS7LIWRnVxyrZc0JRV9Lq087WWhffdH0SieE20Q== X-Received: by 2002:adf:c547:: with SMTP id s7mr32722762wrf.222.1604507307616; Wed, 04 Nov 2020 08:28:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJwoKhhWFlkB5cYF5GlW9CtuWhYTQcL6ZEVQjBREGj6KwNeE0ab59fgtj+MhkulEwbsXapDPFw== X-Received: by 2002:adf:c547:: with SMTP id s7mr32722738wrf.222.1604507307342; Wed, 04 Nov 2020 08:28:27 -0800 (PST) Received: from thinkpad.lan (dynamic-adsl-94-34-39-30.clienti.tiscali.it. [94.34.39.30]) by smtp.gmail.com with ESMTPSA id o4sm3282281wrv.8.2020.11.04.08.28.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2020 08:28:26 -0800 (PST) From: Alberto Milone To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/4 F][SRU][generic][L-R-M] UBUNTU: [Packaging] NVIDIA -- provide the nvidia-prebuilt-kernel virtual package Date: Wed, 4 Nov 2020 17:28:13 +0100 Message-Id: <20201104162816.496957-2-alberto.milone@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201104162816.496957-1-alberto.milone@canonical.com> References: <20201104162816.496957-1-alberto.milone@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Make all the NVIDIA drivers, except for 390, provide the nvidia-prebuilt-kernel virtual package. This allows adding a generic dependency on the signed modules. BugLink: https://bugs.launchpad.net/bugs/1902093 Signed-off-by: Alberto Milone --- debian/control.d/meta-nvidia | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/debian/control.d/meta-nvidia b/debian/control.d/meta-nvidia index 3cb0f94..c858688 100644 --- a/debian/control.d/meta-nvidia +++ b/debian/control.d/meta-nvidia @@ -15,7 +15,7 @@ Package: linux-modules-nvidia-435-generic${variant:suffix} Build-Profiles: Architecture: amd64 Section: kernel -Provides: ${dkms:nvidia-435-modules} +Provides: ${dkms:nvidia-435-modules}, nvidia-prebuilt-kernel Depends: ${misc:Depends}, linux-modules-nvidia-435-@ABI@-generic (= ${binary:Version}), @@ -28,7 +28,7 @@ Package: linux-modules-nvidia-450-generic${variant:suffix} Build-Profiles: Architecture: amd64 Section: kernel -Provides: ${dkms:nvidia-450-modules} +Provides: ${dkms:nvidia-450-modules}, nvidia-prebuilt-kernel Depends: ${misc:Depends}, linux-modules-nvidia-450-@ABI@-generic (= ${binary:Version}), @@ -41,7 +41,7 @@ Package: linux-modules-nvidia-418-server-generic${variant:suffix} Build-Profiles: Architecture: amd64 Section: kernel -Provides: ${dkms:nvidia-418-server-modules} +Provides: ${dkms:nvidia-418-server-modules}, nvidia-prebuilt-kernel Depends: ${misc:Depends}, linux-modules-nvidia-418-server-@ABI@-generic (= ${binary:Version}), @@ -54,7 +54,7 @@ Package: linux-modules-nvidia-440-server-generic${variant:suffix} Build-Profiles: Architecture: amd64 Section: kernel -Provides: ${dkms:nvidia-440-server-modules} +Provides: ${dkms:nvidia-440-server-modules}, nvidia-prebuilt-kernel Depends: ${misc:Depends}, linux-modules-nvidia-440-server-@ABI@-generic (= ${binary:Version}), @@ -67,7 +67,7 @@ Package: linux-modules-nvidia-450-server-generic${variant:suffix} Build-Profiles: Architecture: amd64 Section: kernel -Provides: ${dkms:nvidia-450-server-modules} +Provides: ${dkms:nvidia-450-server-modules}, nvidia-prebuilt-kernel Depends: ${misc:Depends}, linux-modules-nvidia-450-server-@ABI@-generic (= ${binary:Version}), @@ -93,7 +93,7 @@ Package: linux-modules-nvidia-435-lowlatency${variant:suffix} Build-Profiles: Architecture: amd64 Section: kernel -Provides: ${dkms:nvidia-435-modules} +Provides: ${dkms:nvidia-435-modules}, nvidia-prebuilt-kernel Depends: ${misc:Depends}, linux-modules-nvidia-435-@ABI@-lowlatency (= ${binary:Version}), @@ -106,7 +106,7 @@ Package: linux-modules-nvidia-450-lowlatency${variant:suffix} Build-Profiles: Architecture: amd64 Section: kernel -Provides: ${dkms:nvidia-450-modules} +Provides: ${dkms:nvidia-450-modules}, nvidia-prebuilt-kernel Depends: ${misc:Depends}, linux-modules-nvidia-450-@ABI@-lowlatency (= ${binary:Version}), @@ -119,7 +119,7 @@ Package: linux-modules-nvidia-418-server-lowlatency${variant:suffix} Build-Profiles: Architecture: amd64 Section: kernel -Provides: ${dkms:nvidia-418-server-modules} +Provides: ${dkms:nvidia-418-server-modules}, nvidia-prebuilt-kernel Depends: ${misc:Depends}, linux-modules-nvidia-418-server-@ABI@-lowlatency (= ${binary:Version}), @@ -132,7 +132,7 @@ Package: linux-modules-nvidia-440-server-lowlatency${variant:suffix} Build-Profiles: Architecture: amd64 Section: kernel -Provides: ${dkms:nvidia-440-server-modules} +Provides: ${dkms:nvidia-440-server-modules}, nvidia-prebuilt-kernel Depends: ${misc:Depends}, linux-modules-nvidia-440-server-@ABI@-lowlatency (= ${binary:Version}), @@ -145,7 +145,7 @@ Package: linux-modules-nvidia-450-server-lowlatency${variant:suffix} Build-Profiles: Architecture: amd64 Section: kernel -Provides: ${dkms:nvidia-450-server-modules} +Provides: ${dkms:nvidia-450-server-modules}, nvidia-prebuilt-kernel Depends: ${misc:Depends}, linux-modules-nvidia-450-server-@ABI@-lowlatency (= ${binary:Version}), From patchwork Wed Nov 4 16:28:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Milone X-Patchwork-Id: 1394248 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CRBsz4F8Gz9sT6; Thu, 5 Nov 2020 03:28:39 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1kaLeG-0004oC-77; Wed, 04 Nov 2020 16:28:36 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kaLeD-0004n3-OS for kernel-team@lists.ubuntu.com; Wed, 04 Nov 2020 16:28:33 +0000 Received: from mail-wm1-f69.google.com ([209.85.128.69]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kaLeD-0006n7-Eo for kernel-team@lists.ubuntu.com; Wed, 04 Nov 2020 16:28:33 +0000 Received: by mail-wm1-f69.google.com with SMTP id 3so1412657wms.9 for ; Wed, 04 Nov 2020 08:28:33 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tC5U/ALJubKkqQlx+7lbkQjrX61osSuaDTZFvddrb7c=; b=Z9UvcLek5S4aDyLF3KorIjpXpmUBxQLjNSpIuw51QbdAy5KHbOu6iiUxxt2ZBqFE+O TEGCuzpCIFwbiJz2ICi+MiRlA6ViaSDdV245/uoQEnDnKrlELt5NEfL6tQC5q7Jj9P2/ wUEFEf9R4UBZ7e0WYZ3FgXbob63ziLmlQlOCvdseV/DHgJLGf6x7e0nkVkQY+D1hGZr/ 8Do3TYTI2hv6Pz4DfKLgO2PGDC0CWrUVkXGsjgcanJ+MRDD/c6b3l96oRBfBWPruwe+m yv6cn/U4CUZmwt1JUiUJS8Yn/8vgm30EBlWM2JOfZqOMJa58rLC54qiJSLYnD9k3FCBW dQ1A== X-Gm-Message-State: AOAM530HmUnf7c3oDb46n+WK4K+gLTJllPFMYPTKfGL5DwaHrlGkli2u 2vwgDQ3VKkQI/F2vTvOqazEzsAbYO34IGalOo6o3ENZITihW5xrnQrmtj2YmohM7P/GvbtQ1Lpw XM9qAoSORBibX990yjGBxPqARgnPkGYVIGhhwiz9NvA== X-Received: by 2002:a1c:66c4:: with SMTP id a187mr5422529wmc.186.1604507312718; Wed, 04 Nov 2020 08:28:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJzcBFlQTq0FCDUtstkJLdGsVMxk014qUaphee9D2DSMwl54DloYU949N+2EAZoWiPBsGnBE2w== X-Received: by 2002:a1c:66c4:: with SMTP id a187mr5422506wmc.186.1604507312452; Wed, 04 Nov 2020 08:28:32 -0800 (PST) Received: from thinkpad.lan (dynamic-adsl-94-34-39-30.clienti.tiscali.it. [94.34.39.30]) by smtp.gmail.com with ESMTPSA id o4sm3282281wrv.8.2020.11.04.08.28.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2020 08:28:31 -0800 (PST) From: Alberto Milone To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/4 F][SRU][generic][L-R-M] UBUNTU: [Packaging] NVIDIA -- Add the 455 driver Date: Wed, 4 Nov 2020 17:28:14 +0100 Message-Id: <20201104162816.496957-3-alberto.milone@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201104162816.496957-1-alberto.milone@canonical.com> References: <20201104162816.496957-1-alberto.milone@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Add the 455 series, and drop the 435 series. BugLink: https://bugs.launchpad.net/bugs/1902093 Signed-off-by: Alberto Milone --- debian/control.d/meta-nvidia | 24 +++++++++++------------ debian/control.d/nvidia | 8 ++++---- debian/control.d/transitionals-nvidia-435 | 13 ++++++++++++ debian/dkms-versions | 2 +- debian/rules | 16 +++++++-------- 5 files changed, 38 insertions(+), 25 deletions(-) create mode 100644 debian/control.d/transitionals-nvidia-435 diff --git a/debian/control.d/meta-nvidia b/debian/control.d/meta-nvidia index c858688..001e257 100644 --- a/debian/control.d/meta-nvidia +++ b/debian/control.d/meta-nvidia @@ -11,17 +11,17 @@ Description: Extra drivers for nvidia-390 for generic${variant:suffix} Install extra signed nvidia-390 modules compatible with generic${variant:suffix} -Package: linux-modules-nvidia-435-generic${variant:suffix} +Package: linux-modules-nvidia-455-generic${variant:suffix} Build-Profiles: Architecture: amd64 Section: kernel -Provides: ${dkms:nvidia-435-modules}, nvidia-prebuilt-kernel +Provides: ${dkms:nvidia-455-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 generic${variant:suffix} - Install extra signed nvidia-435 modules compatible with + linux-modules-nvidia-455-@ABI@-generic (= ${binary:Version}), + ${nvk:nvidia-455} +Description: Extra drivers for nvidia-455 for generic${variant:suffix} + Install extra signed nvidia-455 modules compatible with generic${variant:suffix} Package: linux-modules-nvidia-450-generic${variant:suffix} @@ -89,17 +89,17 @@ Description: Extra drivers for nvidia-390 for lowlatency${variant:suffix} Install extra signed nvidia-390 modules compatible with lowlatency${variant:suffix} -Package: linux-modules-nvidia-435-lowlatency${variant:suffix} +Package: linux-modules-nvidia-455-lowlatency${variant:suffix} Build-Profiles: Architecture: amd64 Section: kernel -Provides: ${dkms:nvidia-435-modules}, nvidia-prebuilt-kernel +Provides: ${dkms:nvidia-455-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 lowlatency${variant:suffix} - Install extra signed nvidia-435 modules compatible with + linux-modules-nvidia-455-@ABI@-lowlatency (= ${binary:Version}), + ${nvk:nvidia-455} +Description: Extra drivers for nvidia-455 for lowlatency${variant:suffix} + Install extra signed nvidia-455 modules compatible with lowlatency${variant:suffix} Package: linux-modules-nvidia-450-lowlatency${variant:suffix} diff --git a/debian/control.d/nvidia b/debian/control.d/nvidia index 383c55d..7558620 100644 --- a/debian/control.d/nvidia +++ b/debian/control.d/nvidia @@ -17,7 +17,7 @@ Description: Linux kernel nvidia modules for version @ABI@ which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-modules-nvidia-435-@ABI@-generic +Package: linux-modules-nvidia-455-@ABI@-generic Build-Profiles: Architecture: amd64 Section: kernel @@ -32,7 +32,7 @@ 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 - one of the linux-modules-nvidia-435-generic* meta-packages, + one of the linux-modules-nvidia-455-generic* meta-packages, which will ensure that upgrades work correctly, and that supporting packages are also installed. @@ -131,7 +131,7 @@ Description: Linux kernel nvidia modules for version @ABI@ 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: Architecture: amd64 Section: kernel @@ -146,7 +146,7 @@ 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 - one of the linux-modules-nvidia-435-lowlatency* meta-packages, + one of the linux-modules-nvidia-455-lowlatency* meta-packages, which will ensure that upgrades work correctly, and that supporting packages are also installed. diff --git a/debian/control.d/transitionals-nvidia-435 b/debian/control.d/transitionals-nvidia-435 new file mode 100644 index 0000000..9419998 --- /dev/null +++ b/debian/control.d/transitionals-nvidia-435 @@ -0,0 +1,13 @@ +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. diff --git a/debian/dkms-versions b/debian/dkms-versions index cda76a2..4029316 100644 --- a/debian/dkms-versions +++ b/debian/dkms-versions @@ -1,6 +1,6 @@ zfs-linux 0.8.3-1ubuntu12.4 nvidia-graphics-drivers-390 390.138-0ubuntu0.20.04.1 -nvidia-graphics-drivers-435 435.21-0ubuntu7 +nvidia-graphics-drivers-455 0 nvidia-graphics-drivers-450 450.66-0ubuntu0.20.04.1 nvidia-graphics-drivers-418-server 418.152.00-0ubuntu0.20.04.1 nvidia-graphics-drivers-440-server 440.95.01-0ubuntu0.20.04.1 diff --git a/debian/rules b/debian/rules index 91dcab6..744645a 100755 --- a/debian/rules +++ b/debian/rules @@ -14,14 +14,14 @@ src_series = $(shell dpkg-parsechangelog -SDistribution | sed -e 's/-\(security\ src_kernel = $(shell echo "$(src_package)" | sed -e 's/restricted-modules-//') 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) @@ -140,10 +140,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 @@ -177,14 +177,14 @@ override_dh_auto_install: prepare-dkms $(flavours) gencontrol_flags := 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))" From patchwork Wed Nov 4 16:28:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Milone X-Patchwork-Id: 1394249 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CRBt32MMhz9sRR; Thu, 5 Nov 2020 03:28:43 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1kaLeJ-0004pp-Iv; Wed, 04 Nov 2020 16:28:39 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kaLeG-0004oV-Q3 for kernel-team@lists.ubuntu.com; Wed, 04 Nov 2020 16:28:36 +0000 Received: from mail-wm1-f72.google.com ([209.85.128.72]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kaLeG-0006nI-B4 for kernel-team@lists.ubuntu.com; Wed, 04 Nov 2020 16:28:36 +0000 Received: by mail-wm1-f72.google.com with SMTP id p7so804060wma.9 for ; Wed, 04 Nov 2020 08:28:36 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=acb7UCarV7PLBO0bGG5xNdq5Zu5eSBIpM6zAn6AD08Q=; b=iKtaxJAIiltlZoimjeqHm1HQCngI2YCxspYVBPMG8YFN5hgm/UDGUXNdWtBPfFiduy OL+nVeBwInjrG5pp5JptxeJDjX+g6ndYLAcw9DIlbn4NyVu0WpsPP/BL664mxLq6qBmc mCQNZX1c393kEbZJZUWRQhnABA8LtBv879ihyJGJfzJgmmpLzCPH5FolAtrB3UihKv7E rr1cdpgccj7JgVaeVyQrVPC+RFsP1wPpEKddUlj/F6iBbq8Wcy4fcfGxZxo1KiQcxiXB bdR0gL4qkLTRlNkbjpiNPw9BJXxDk+s64ovlrnq61ipSrZmL8NRdzv0GsBTs/CihZVli fdEg== X-Gm-Message-State: AOAM533yZolPIw6Pf24NA+Jahqldbh6nlQHT7+igEqXC8aNl4JoeTwy9 edB/5fxoywWYvVwdc22VRsClgRpa2HSlyAyj+DraTBFQPzF8uWGLJ6wLj+SWSg66yD0t/7kQDDL oHysoQGyYkHJCxadO6V8tW0lN5scSqEgSf7+l/jhpSQ== X-Received: by 2002:a5d:6ca8:: with SMTP id a8mr18758980wra.319.1604507315762; Wed, 04 Nov 2020 08:28:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJwmZpqorRtPTs2TCPp4yUzs3NQ4h7a+Ji9245EkqBvGxjiAKNUI+IeMVJpV69m/SF7UxZst3Q== X-Received: by 2002:a5d:6ca8:: with SMTP id a8mr18758961wra.319.1604507315519; Wed, 04 Nov 2020 08:28:35 -0800 (PST) Received: from thinkpad.lan (dynamic-adsl-94-34-39-30.clienti.tiscali.it. [94.34.39.30]) by smtp.gmail.com with ESMTPSA id o4sm3282281wrv.8.2020.11.04.08.28.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2020 08:28:34 -0800 (PST) From: Alberto Milone To: kernel-team@lists.ubuntu.com Subject: [PATCH 3/4 F][SRU][hwe-5.8][L-R-M] UBUNTU: [Packaging] NVIDIA -- provide the nvidia-prebuilt-kernel virtual package Date: Wed, 4 Nov 2020 17:28:15 +0100 Message-Id: <20201104162816.496957-4-alberto.milone@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201104162816.496957-1-alberto.milone@canonical.com> References: <20201104162816.496957-1-alberto.milone@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Make all the NVIDIA drivers, except for 390, provide the nvidia-prebuilt-kernel virtual package. This allows adding a generic dependency on the signed modules. BugLink: https://bugs.launchpad.net/bugs/1902093 Signed-off-by: Alberto Milone --- debian/control.d/meta-nvidia | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/debian/control.d/meta-nvidia b/debian/control.d/meta-nvidia index 178d771..61845e9 100644 --- a/debian/control.d/meta-nvidia +++ b/debian/control.d/meta-nvidia @@ -15,7 +15,7 @@ Package: linux-modules-nvidia-435-generic${variant:suffix} Build-Profiles: Architecture: amd64 Section: kernel -Provides: ${dkms:nvidia-435-modules} +Provides: ${dkms:nvidia-435-modules}, nvidia-prebuilt-kernel Depends: ${misc:Depends}, linux-modules-nvidia-435-@ABI@-generic (= ${binary:Version}), @@ -28,7 +28,7 @@ Package: linux-modules-nvidia-450-generic${variant:suffix} Build-Profiles: Architecture: amd64 Section: kernel -Provides: ${dkms:nvidia-450-modules} +Provides: ${dkms:nvidia-450-modules}, nvidia-prebuilt-kernel Depends: ${misc:Depends}, linux-modules-nvidia-450-@ABI@-generic (= ${binary:Version}), @@ -41,7 +41,7 @@ Package: linux-modules-nvidia-418-server-generic${variant:suffix} Build-Profiles: Architecture: amd64 Section: kernel -Provides: ${dkms:nvidia-418-server-modules} +Provides: ${dkms:nvidia-418-server-modules}, nvidia-prebuilt-kernel Depends: ${misc:Depends}, linux-modules-nvidia-418-server-@ABI@-generic (= ${binary:Version}), @@ -54,7 +54,7 @@ Package: linux-modules-nvidia-440-server-generic${variant:suffix} Build-Profiles: Architecture: amd64 Section: kernel -Provides: ${dkms:nvidia-440-server-modules} +Provides: ${dkms:nvidia-440-server-modules}, nvidia-prebuilt-kernel Depends: ${misc:Depends}, linux-modules-nvidia-440-server-@ABI@-generic (= ${binary:Version}), @@ -67,7 +67,7 @@ Package: linux-modules-nvidia-450-server-generic${variant:suffix} Build-Profiles: Architecture: amd64 Section: kernel -Provides: ${dkms:nvidia-450-server-modules} +Provides: ${dkms:nvidia-450-server-modules}, nvidia-prebuilt-kernel Depends: ${misc:Depends}, linux-modules-nvidia-450-server-@ABI@-generic (= ${binary:Version}), @@ -93,7 +93,7 @@ Package: linux-modules-nvidia-435-lowlatency${variant:suffix} Build-Profiles: Architecture: amd64 Section: kernel -Provides: ${dkms:nvidia-435-modules} +Provides: ${dkms:nvidia-435-modules}, nvidia-prebuilt-kernel Depends: ${misc:Depends}, linux-modules-nvidia-435-@ABI@-lowlatency (= ${binary:Version}), @@ -106,7 +106,7 @@ Package: linux-modules-nvidia-450-lowlatency${variant:suffix} Build-Profiles: Architecture: amd64 Section: kernel -Provides: ${dkms:nvidia-450-modules} +Provides: ${dkms:nvidia-450-modules}, nvidia-prebuilt-kernel Depends: ${misc:Depends}, linux-modules-nvidia-450-@ABI@-lowlatency (= ${binary:Version}), @@ -119,7 +119,7 @@ Package: linux-modules-nvidia-418-server-lowlatency${variant:suffix} Build-Profiles: Architecture: amd64 Section: kernel -Provides: ${dkms:nvidia-418-server-modules} +Provides: ${dkms:nvidia-418-server-modules}, nvidia-prebuilt-kernel Depends: ${misc:Depends}, linux-modules-nvidia-418-server-@ABI@-lowlatency (= ${binary:Version}), ${nvk:nvidia-418-server} @@ -130,7 +130,7 @@ Package: linux-modules-nvidia-440-server-lowlatency${variant:suffix} Build-Profiles: Architecture: amd64 Section: kernel -Provides: ${dkms:nvidia-440-server-modules} +Provides: ${dkms:nvidia-440-server-modules}, nvidia-prebuilt-kernel Depends: ${misc:Depends}, linux-modules-nvidia-440-server-@ABI@-lowlatency (= ${binary:Version}), ${nvk:nvidia-440-server} @@ -141,7 +141,7 @@ Package: linux-modules-nvidia-450-server-lowlatency${variant:suffix} Build-Profiles: Architecture: amd64 Section: kernel -Provides: ${dkms:nvidia-450-server-modules} +Provides: ${dkms:nvidia-450-server-modules}, nvidia-prebuilt-kernel Depends: ${misc:Depends}, linux-modules-nvidia-450-server-@ABI@-lowlatency (= ${binary:Version}), ${nvk:nvidia-450-server} Description: Extra drivers for nvidia-450-server for the lowlatency flavour From patchwork Wed Nov 4 16:28:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Milone X-Patchwork-Id: 1394250 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CRBt966Vyz9sRR; Thu, 5 Nov 2020 03:28:49 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1kaLeQ-0004t6-3J; Wed, 04 Nov 2020 16:28:46 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kaLeM-0004rg-Ng for kernel-team@lists.ubuntu.com; Wed, 04 Nov 2020 16:28:42 +0000 Received: from mail-wr1-f70.google.com ([209.85.221.70]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kaLeM-0006nr-CQ for kernel-team@lists.ubuntu.com; Wed, 04 Nov 2020 16:28:42 +0000 Received: by mail-wr1-f70.google.com with SMTP id i1so9441019wrb.18 for ; Wed, 04 Nov 2020 08:28:42 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MTUXmbTNrLeR06wacRVYLknILEzwrE/Elf6p3+MtnPc=; b=c5oI7sFezRPob6HPRyrkCxTrl2vc3oWzWynh0FxU3V6v8LrthylQaeglqn1sk7tEz0 lN/p4QAuhPtAuCwL3IleQSPdD1b85of8pkopRlIL7ljbMCWlDq7sUewDOjc+XfmqHVb1 wi8n4POtwPF02P6jH4Z5KnRkV6gUFQRYBBdE5G9lpP7m1Twm6Y2kgQLbECGMAV1HUceC qlK5taam0lRa8rjeK4Xl+a6143NaSMBpetSJgNOlo+uXbR5PoDGjMQn5SsRY1EHWgoqT ocdl8efymRIDoXfb2TZeWQzCOqiep3uHz50oiZnS05G5lo68hzAJb+sq9vRNxZkleeNY +n1g== X-Gm-Message-State: AOAM532tPnvVHox6IOfGe7QL7WjnvpKxxjz3iidZyYzYK53tsYtkVcax Za7K5mTOfawDoQ4+ptHD4xBc7v7g18kSQRcuh40eEPcaCS+OFRTex/gFXRiZ1GEBIbtwySph8mB UUmR+E35UeaL4mC2RtU9BvUPIBAZ1GX75fKJ6KNTPsQ== X-Received: by 2002:a1c:5401:: with SMTP id i1mr5461935wmb.124.1604507321581; Wed, 04 Nov 2020 08:28:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJy5gVUc8nBp1puswr70gWHybFXgMEwti4ArbESzR0/cfsBQQvID4T0+12XWpLmwvsyGKJoQEA== X-Received: by 2002:a1c:5401:: with SMTP id i1mr5461917wmb.124.1604507321291; Wed, 04 Nov 2020 08:28:41 -0800 (PST) Received: from thinkpad.lan (dynamic-adsl-94-34-39-30.clienti.tiscali.it. [94.34.39.30]) by smtp.gmail.com with ESMTPSA id o4sm3282281wrv.8.2020.11.04.08.28.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2020 08:28:40 -0800 (PST) From: Alberto Milone To: kernel-team@lists.ubuntu.com Subject: [PATCH 4/4 F][SRU][hwe-5.8][L-R-M] UBUNTU: [Packaging] NVIDIA -- Add the 455 driver Date: Wed, 4 Nov 2020 17:28:16 +0100 Message-Id: <20201104162816.496957-5-alberto.milone@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201104162816.496957-1-alberto.milone@canonical.com> References: <20201104162816.496957-1-alberto.milone@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Add the 455 series, and drop the 435 series. BugLink: https://bugs.launchpad.net/bugs/1902093 Signed-off-by: Alberto Milone --- debian/control.d/meta-nvidia | 24 +++++++++++------------ debian/control.d/nvidia | 8 ++++---- debian/control.d/transitionals-nvidia-435 | 13 ++++++++++++ debian/dkms-versions | 2 +- debian/rules | 16 +++++++-------- 5 files changed, 38 insertions(+), 25 deletions(-) create mode 100644 debian/control.d/transitionals-nvidia-435 diff --git a/debian/control.d/meta-nvidia b/debian/control.d/meta-nvidia index 61845e9..badbdd2 100644 --- a/debian/control.d/meta-nvidia +++ b/debian/control.d/meta-nvidia @@ -11,17 +11,17 @@ Description: Extra drivers for nvidia-390 for generic${variant:suffix} Install extra signed nvidia-390 modules compatible with generic${variant:suffix} -Package: linux-modules-nvidia-435-generic${variant:suffix} +Package: linux-modules-nvidia-455-generic${variant:suffix} Build-Profiles: Architecture: amd64 Section: kernel -Provides: ${dkms:nvidia-435-modules}, nvidia-prebuilt-kernel +Provides: ${dkms:nvidia-455-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 generic${variant:suffix} - Install extra signed nvidia-435 modules compatible with + linux-modules-nvidia-455-@ABI@-generic (= ${binary:Version}), + ${nvk:nvidia-455} +Description: Extra drivers for nvidia-455 for generic${variant:suffix} + Install extra signed nvidia-455 modules compatible with generic${variant:suffix} Package: linux-modules-nvidia-450-generic${variant:suffix} @@ -89,17 +89,17 @@ Description: Extra drivers for nvidia-390 for lowlatency${variant:suffix} Install extra signed nvidia-390 modules compatible with lowlatency${variant:suffix} -Package: linux-modules-nvidia-435-lowlatency${variant:suffix} +Package: linux-modules-nvidia-455-lowlatency${variant:suffix} Build-Profiles: Architecture: amd64 Section: kernel -Provides: ${dkms:nvidia-435-modules}, nvidia-prebuilt-kernel +Provides: ${dkms:nvidia-455-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 lowlatency${variant:suffix} - Install extra signed nvidia-435 modules compatible with + linux-modules-nvidia-455-@ABI@-lowlatency (= ${binary:Version}), + ${nvk:nvidia-455} +Description: Extra drivers for nvidia-455 for lowlatency${variant:suffix} + Install extra signed nvidia-455 modules compatible with lowlatency${variant:suffix} Package: linux-modules-nvidia-450-lowlatency${variant:suffix} diff --git a/debian/control.d/nvidia b/debian/control.d/nvidia index 383c55d..7558620 100644 --- a/debian/control.d/nvidia +++ b/debian/control.d/nvidia @@ -17,7 +17,7 @@ Description: Linux kernel nvidia modules for version @ABI@ which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-modules-nvidia-435-@ABI@-generic +Package: linux-modules-nvidia-455-@ABI@-generic Build-Profiles: Architecture: amd64 Section: kernel @@ -32,7 +32,7 @@ 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 - one of the linux-modules-nvidia-435-generic* meta-packages, + one of the linux-modules-nvidia-455-generic* meta-packages, which will ensure that upgrades work correctly, and that supporting packages are also installed. @@ -131,7 +131,7 @@ Description: Linux kernel nvidia modules for version @ABI@ 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: Architecture: amd64 Section: kernel @@ -146,7 +146,7 @@ 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 - one of the linux-modules-nvidia-435-lowlatency* meta-packages, + one of the linux-modules-nvidia-455-lowlatency* meta-packages, which will ensure that upgrades work correctly, and that supporting packages are also installed. diff --git a/debian/control.d/transitionals-nvidia-435 b/debian/control.d/transitionals-nvidia-435 new file mode 100644 index 0000000..9419998 --- /dev/null +++ b/debian/control.d/transitionals-nvidia-435 @@ -0,0 +1,13 @@ +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. diff --git a/debian/dkms-versions b/debian/dkms-versions index cc4a4ca..a88de67 100644 --- a/debian/dkms-versions +++ b/debian/dkms-versions @@ -1,6 +1,6 @@ zfs-linux 0.8.4-1ubuntu11 nvidia-graphics-drivers-390 390.138-0ubuntu2 -nvidia-graphics-drivers-435 435.21-0ubuntu8 +nvidia-graphics-drivers-455 0 nvidia-graphics-drivers-450 450.80.02-0ubuntu1 nvidia-graphics-drivers-418-server 418.152.00-0ubuntu2 nvidia-graphics-drivers-440-server 440.95.01-0ubuntu2 diff --git a/debian/rules b/debian/rules index 91dcab6..744645a 100755 --- a/debian/rules +++ b/debian/rules @@ -14,14 +14,14 @@ src_series = $(shell dpkg-parsechangelog -SDistribution | sed -e 's/-\(security\ src_kernel = $(shell echo "$(src_package)" | sed -e 's/restricted-modules-//') 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) @@ -140,10 +140,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 @@ -177,14 +177,14 @@ override_dh_auto_install: prepare-dkms $(flavours) gencontrol_flags := 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))"