From patchwork Tue Aug 25 15:47:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Milone X-Patchwork-Id: 1351138 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 4BbYLB4JGSz9sTN; Wed, 26 Aug 2020 01:48:18 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1kAbBH-0001y7-39; Tue, 25 Aug 2020 15:48:15 +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 1kAbBF-0001xl-EX for kernel-team@lists.ubuntu.com; Tue, 25 Aug 2020 15:48:13 +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 1kAbBF-0001bl-7R for kernel-team@lists.ubuntu.com; Tue, 25 Aug 2020 15:48:13 +0000 Received: by mail-wr1-f71.google.com with SMTP id k23so3106636wrd.5 for ; Tue, 25 Aug 2020 08:48:13 -0700 (PDT) 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=6TgTuA5o2gH0iuO0cXmW0WdKrY6WoMO4e/uKLOTH900=; b=LLrlvIOW3RaiSFOVuDO3RV7lbW6+iXBSvoPdorJwEllIwEgbe2XSjQA8pQs3IlpmDd 1RCsaxvqu58Z9MNGboJZO+fgW4TADJ19TYDrBkx3r/QhhrxA7E1R39K8mADNDg3Hzfud OYYUryXvgiBrbp0zo5bqwJeNwsnZ/GMS0vtmrQhevvY728qJMBDvMIM9oSxg823uV24w PC3eJVceQKIADO1nF07thPjCLytGnG/Z7IHt6p+2fj+/4kBZiRyz/Ut8xnOdcrI9bDVN 8fbQeYWsnF5SXSn+TTPqKtwdv2AzEPebKu7IWzMf0I7hJHALHMU7aUZuepbKAg4T+OER fgzA== X-Gm-Message-State: AOAM530hVguka3nSXdum0aQP+qTUU1QHwt4q5/aV77lR7BN01vYIFqg8 PWjWXtzlV9BWqaV3WF+Dnxy88s4C3/+jWMtizV3GmCMC1IJ5CtNDhT2+Loz+lQe6P8lpB6I0a5J UiE04adh9dadTyuu5E5LQDfIxDtqLGpRpg5NV0iVMhQ== X-Received: by 2002:a1c:e006:: with SMTP id x6mr2840338wmg.128.1598370492402; Tue, 25 Aug 2020 08:48:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzNsgGh+AabjZS3gcdOB/w+vkxgtL2K3UTI7pooR+236XxlZO/USeV7KbELyVHErueFI4X0og== X-Received: by 2002:a1c:e006:: with SMTP id x6mr2840324wmg.128.1598370492127; Tue, 25 Aug 2020 08:48:12 -0700 (PDT) Received: from thinkpad.lan (dynamic-adsl-94-34-39-30.clienti.tiscali.it. [94.34.39.30]) by smtp.gmail.com with ESMTPSA id h14sm7115715wml.30.2020.08.25.08.48.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 08:48:11 -0700 (PDT) From: Alberto Milone To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/10 B][SRU] UBUNTU: [packaging] add signed modules for nvidia 450 and 450-server Date: Tue, 25 Aug 2020 17:47:47 +0200 Message-Id: <20200825154756.3753617-2-alberto.milone@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200825154756.3753617-1-alberto.milone@canonical.com> References: <20200825154756.3753617-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" While the 450 series replaces the 440 series, the 450-server series is only an addition to the 440-server series. BugLink: https://bugs.launchpad.net/bugs/1887674 Signed-off-by: Alberto Milone --- debian/dkms-versions | 3 ++- debian/rules | 3 ++- debian/rules.d/2-binary-arch.mk | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/dkms-versions b/debian/dkms-versions index 0f282ccfcbf8..48c21409c73d 100644 --- a/debian/dkms-versions +++ b/debian/dkms-versions @@ -2,7 +2,8 @@ spl-linux 0.7.5-1ubuntu2.2 zfs-linux 0.7.5-1ubuntu16.9 nvidia-graphics-drivers-390 390.138-0ubuntu0.18.04.1 nvidia-graphics-drivers-435 435.21-0ubuntu0.18.04.3 -nvidia-graphics-drivers-440 440.100-0ubuntu0.18.04.1 +nvidia-graphics-drivers-450 0 nvidia-graphics-drivers-418-server 418.152.00-0ubuntu0.18.04.1 nvidia-graphics-drivers-440-server 440.95.01-0ubuntu0.18.04.1 +nvidia-graphics-drivers-450-server 0 wireguard-linux-compat 1.0.20200611-1ubuntu1~18.04.1 diff --git a/debian/rules b/debian/rules index bebeb4e9f243..ae51054eb3e8 100755 --- a/debian/rules +++ b/debian/rules @@ -116,9 +116,10 @@ dkms_zfs_linux_version=$(shell gawk '/^zfs-linux / { print $$2; }' debian/dkms-v dkms_spl_linux_version=$(shell gawk '/^spl-linux / { 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) +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) dkms_wireguard_version=$(shell gawk '/^wireguard-linux-compat / { print $$2; }' debian/dkms-versions) # Debian Build System targets diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index b7d88126a3b7..4f8caade0b21 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -406,12 +406,13 @@ endif 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_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) + $(call build_dkms, $(bldinfo_pkg_name)-$*, $(pkgdir_bldinfo)/usr/lib/linux/$(abi_release)-$*/signatures, 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) endif ifeq ($(do_dkms_nvidia_server),true) $(call build_dkms, $(bldinfo_pkg_name)-$*, $(pkgdir_bldinfo)/usr/lib/linux/$(abi_release)-$*/signatures, nvidia-418srv, pool/restricted/n/nvidia-graphics-drivers-418-server/nvidia-kernel-source-418-server_$(dkms_nvidia_418_server_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-418-server/nvidia-dkms-418-server_$(dkms_nvidia_418_server_version)_$(arch).deb) $(call build_dkms, $(bldinfo_pkg_name)-$*, $(pkgdir_bldinfo)/usr/lib/linux/$(abi_release)-$*/signatures, nvidia-440srv, pool/restricted/n/nvidia-graphics-drivers-440-server/nvidia-kernel-source-440-server_$(dkms_nvidia_440_server_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-440-server/nvidia-dkms-440-server_$(dkms_nvidia_440_server_version)_$(arch).deb) + $(call build_dkms, $(bldinfo_pkg_name)-$*, $(pkgdir_bldinfo)/usr/lib/linux/$(abi_release)-$*/signatures, nvidia-450srv, pool/restricted/n/nvidia-graphics-drivers-450-server/nvidia-kernel-source-450-server_$(dkms_nvidia_450_server_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-450-server/nvidia-dkms-450-server_$(dkms_nvidia_450_server_version)_$(arch).deb) endif # Build the final ABI information. From patchwork Tue Aug 25 15:47:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Milone X-Patchwork-Id: 1351139 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 4BbYLJ3fdYz9sTN; Wed, 26 Aug 2020 01:48:24 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1kAbBN-0001zx-AN; Tue, 25 Aug 2020 15:48:21 +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 1kAbBK-0001zK-Hw for kernel-team@lists.ubuntu.com; Tue, 25 Aug 2020 15:48:18 +0000 Received: from mail-wr1-f72.google.com ([209.85.221.72]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kAbBK-0001cA-A3 for kernel-team@lists.ubuntu.com; Tue, 25 Aug 2020 15:48:18 +0000 Received: by mail-wr1-f72.google.com with SMTP id b8so5309471wrr.2 for ; Tue, 25 Aug 2020 08:48:18 -0700 (PDT) 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=NOfj6Ap0UclxdZCiPRHwKE+XACSBZa7i21+0R5xORrk=; b=pgWbXqRU4qo8O90tHuPKzcwUbf9MnrxME6oHdPPRgkqrJkgMpPWOnGodcRUsOAfIOu AfHPPItlIz13we///FbtUNiaUIFLNBEjffm0O0ljQasGio/OXa1MTdSZqde/bFwht5ZZ 1S++AsqIdc/a95ZOCGVGqwQ81BiXNY+YnsFveCNp6uy9PXPglFRXAf21gUbue19mF5/K YtdQiQzLtGUfC/DypyXpI2IX9ZUEw5fbXi8Lct7LSTIVKnX14tOuPpC2HkrkxwUT+ObO znCz8NY2zeYyhWbVlzi+Bc/1HeMlj34q4OJ8vS5DYMSAGk0d9aO76C469pJ6tyVEYyQU ey1g== X-Gm-Message-State: AOAM530pVfXQ5r2tKLYBLTfgk6n/AAs9l5rwUzB73r6BrlgX8PYbSwIb UoZUykHrdqd9WRUrQ4vY0Hk7QMU/EJYVIXA1sss0BKzLodsauPzVtmTIEdEjEjmDyclvddvFAGl 2luoaM2jLXhJj6VPBbuetW5AfSCudGgMX+r2QhMSVug== X-Received: by 2002:a1c:f311:: with SMTP id q17mr2766738wmq.92.1598370497368; Tue, 25 Aug 2020 08:48:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwSRaB/BqhnVA4eAWrW3dWe0W5X4jdFG1QJdu0W++1nXsPZnwBqQ25f8uGU+Qy8bvXnQnFHzQ== X-Received: by 2002:a1c:f311:: with SMTP id q17mr2766706wmq.92.1598370496869; Tue, 25 Aug 2020 08:48:16 -0700 (PDT) Received: from thinkpad.lan (dynamic-adsl-94-34-39-30.clienti.tiscali.it. [94.34.39.30]) by smtp.gmail.com with ESMTPSA id h14sm7115715wml.30.2020.08.25.08.48.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 08:48:16 -0700 (PDT) From: Alberto Milone To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/10 B][SRU][L-R-M] UBUNTU: [packaging] add signed modules for nvidia 450 and 450-server Date: Tue, 25 Aug 2020 17:47:48 +0200 Message-Id: <20200825154756.3753617-3-alberto.milone@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200825154756.3753617-1-alberto.milone@canonical.com> References: <20200825154756.3753617-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" While the 450 series replaces the 440 series (which we are adding transitional packages for), the 450-server series is only an addition to the 440-server series. BugLink: https://bugs.launchpad.net/bugs/1887674 Signed-off-by: Alberto Milone --- debian/control.stub | 90 +++++++++++++++++++++++++++++++++++++------- debian/dkms-versions | 3 +- debian/rules | 25 ++++++++---- 3 files changed, 95 insertions(+), 23 deletions(-) diff --git a/debian/control.stub b/debian/control.stub index b974f24..d0d2a2c 100644 --- a/debian/control.stub +++ b/debian/control.stub @@ -114,7 +114,7 @@ Depends: ${misc:Depends}, linux-modules-nvidia-435-ABI-lowlatency (= ${binary:Ve Description: Extra drivers for nvidia-435 for the lowlatency flavour Install extra signed nvidia-435 modules compatible with the lowlatency flavour. -Package: linux-modules-nvidia-440-ABI-generic +Package: linux-modules-nvidia-450-ABI-generic Build-Profiles: Architecture: amd64 Section: kernel @@ -128,7 +128,7 @@ Description: Linux kernel nvidia modules for version ABI linux-image-nvidia-FLAVOUR meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-modules-nvidia-440-ABI-lowlatency +Package: linux-modules-nvidia-450-ABI-lowlatency Build-Profiles: Architecture: amd64 Section: kernel @@ -142,25 +142,25 @@ Description: Linux kernel nvidia modules for version ABI linux-image-nvidia-FLAVOUR meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-modules-nvidia-440-generic +Package: linux-modules-nvidia-450-generic Build-Profiles: Architecture: amd64 Section: kernel -Provides: ${dkms:nvidia-440-modules} -Depends: ${misc:Depends}, linux-modules-nvidia-440-ABI-generic (= ${binary:Version}), - ${nvk:nvidia-440} -Description: Extra drivers for nvidia-440 for the generic flavour - Install extra signed nvidia-440 modules compatible with the generic flavour. +Provides: ${dkms:nvidia-450-modules} +Depends: ${misc:Depends}, linux-modules-nvidia-450-ABI-generic (= ${binary:Version}), + ${nvk:nvidia-450} +Description: Extra drivers for nvidia-450 for the generic flavour + Install extra signed nvidia-450 modules compatible with the generic flavour. -Package: linux-modules-nvidia-440-lowlatency +Package: linux-modules-nvidia-450-lowlatency Build-Profiles: Architecture: amd64 Section: kernel -Provides: ${dkms:nvidia-440-modules} -Depends: ${misc:Depends}, linux-modules-nvidia-440-ABI-lowlatency (= ${binary:Version}), - ${nvk:nvidia-440} -Description: Extra drivers for nvidia-440 for the lowlatency flavour - Install extra signed nvidia-440 modules compatible with the lowlatency flavour. +Provides: ${dkms:nvidia-450-modules} +Depends: ${misc:Depends}, linux-modules-nvidia-450-ABI-lowlatency (= ${binary:Version}), + ${nvk:nvidia-450} +Description: Extra drivers for nvidia-450 for the lowlatency flavour + Install extra signed nvidia-450 modules compatible with the lowlatency flavour. Package: linux-modules-nvidia-418-server-ABI-generic Build-Profiles: @@ -257,3 +257,65 @@ Depends: ${misc:Depends}, linux-modules-nvidia-440-server-ABI-lowlatency (= ${bi ${nvk:nvidia-440-server} Description: Extra drivers for nvidia-440-server for the lowlatency flavour Install extra signed nvidia-440-server modules compatible with the lowlatency flavour. + +Package: linux-modules-nvidia-450-server-ABI-generic +Build-Profiles: +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, +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-450-server-ABI-lowlatency +Build-Profiles: +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, +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-450-server-generic +Build-Profiles: +Architecture: amd64 +Section: kernel +Provides: ${dkms:nvidia-450-server-modules} +Depends: ${misc:Depends}, linux-modules-nvidia-450-server-ABI-generic (= ${binary:Version}), + ${nvk:nvidia-450-server} +Description: Extra drivers for nvidia-450-server for the generic flavour + Install extra signed nvidia-450-server modules compatible with the generic flavour. + +Package: linux-modules-nvidia-450-server-lowlatency +Build-Profiles: +Architecture: amd64 +Section: kernel +Provides: ${dkms:nvidia-450-server-modules} +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 + Install extra signed nvidia-450-server modules compatible with the lowlatency flavour. + +Package: linux-modules-nvidia-440-generic +Architecture: amd64 +Section: oldlibs +Depends: linux-modules-nvidia-450-generic +Description: Extra drivers for nvidia-440 for the generic flavour (dummy transitional package) + Transitional package for upgrades of -440 to -450. + +Package: linux-modules-nvidia-440-lowlatency +Architecture: amd64 +Section: oldlibs +Depends: linux-modules-nvidia-450-lowlatency +Description: Extra drivers for nvidia-440 for the generic flavour (dummy transitional package) + Transitional package for upgrades of -440 to -450. diff --git a/debian/dkms-versions b/debian/dkms-versions index 0f282cc..48c2140 100644 --- a/debian/dkms-versions +++ b/debian/dkms-versions @@ -2,7 +2,8 @@ spl-linux 0.7.5-1ubuntu2.2 zfs-linux 0.7.5-1ubuntu16.9 nvidia-graphics-drivers-390 390.138-0ubuntu0.18.04.1 nvidia-graphics-drivers-435 435.21-0ubuntu0.18.04.3 -nvidia-graphics-drivers-440 440.100-0ubuntu0.18.04.1 +nvidia-graphics-drivers-450 0 nvidia-graphics-drivers-418-server 418.152.00-0ubuntu0.18.04.1 nvidia-graphics-drivers-440-server 440.95.01-0ubuntu0.18.04.1 +nvidia-graphics-drivers-450-server 0 wireguard-linux-compat 1.0.20200611-1ubuntu1~18.04.1 diff --git a/debian/rules b/debian/rules index 210465a..ef219b3 100755 --- a/debian/rules +++ b/debian/rules @@ -15,15 +15,17 @@ src_version = $(shell echo $(src_fullversion) | sed -e 's/+[0-9][0-9]*//') 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) +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_440_upstream_version=$(shell echo "$(dkms_nvidia_440_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) +nvidia_450_server_upstream_version=$(shell echo "$(dkms_nvidia_450_server_version)" | cut -d '-' -f 1) test: echo "$(src_fullversion) $(src_version)" @@ -105,10 +107,10 @@ nvidia-%: $(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-440-$(src_abi)-$* - install -d debian/linux-modules-nvidia-440-$(src_abi)-$*/usr/lib/linux/triggers - $(call build_dkms, $(src_abi)-$*, linux-modules-nvidia-440-$(src_abi)-$*, $(CURDIR)/debian/linux-modules-nvidia-440-$(src_abi)-$*/lib/modules/$(src_abi)-$*/kernel, 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) - $(call install_control,linux-modules-nvidia-440-$(src_abi)-$*,$*,nvidia,440,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 + $(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) install -d debian/linux-modules-nvidia-418-server-$(src_abi)-$* install -d debian/linux-modules-nvidia-418-server-$(src_abi)-$*/usr/lib/linux/triggers @@ -120,6 +122,11 @@ nvidia-%: $(call build_dkms, $(src_abi)-$*, linux-modules-nvidia-440-server-$(src_abi)-$*, $(CURDIR)/debian/linux-modules-nvidia-440-server-$(src_abi)-$*/lib/modules/$(src_abi)-$*/kernel, nvidia-440srv, pool/restricted/n/nvidia-graphics-drivers-440-server/nvidia-kernel-source-440-server_$(dkms_nvidia_440_server_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-440-server/nvidia-dkms-440-server_$(dkms_nvidia_440_server_version)_$(arch).deb) $(call install_control,linux-modules-nvidia-440-server-$(src_abi)-$*,$*,nvidia,440srv,postinst postrm prerm config templates) + install -d debian/linux-modules-nvidia-450-server-$(src_abi)-$* + install -d debian/linux-modules-nvidia-450-server-$(src_abi)-$*/usr/lib/linux/triggers + $(call build_dkms, $(src_abi)-$*, linux-modules-nvidia-450-server-$(src_abi)-$*, $(CURDIR)/debian/linux-modules-nvidia-450-server-$(src_abi)-$*/lib/modules/$(src_abi)-$*/kernel, nvidia-450srv, pool/restricted/n/nvidia-graphics-drivers-450-server/nvidia-kernel-source-450-server_$(dkms_nvidia_450_server_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-450-server/nvidia-dkms-450-server_$(dkms_nvidia_450_server_version)_$(arch).deb) + $(call install_control,linux-modules-nvidia-450-server-$(src_abi)-$*,$*,nvidia,450srv,postinst postrm prerm config templates) + prepare-dkms: mkdir -p $(dkms_dir) ln -s /usr/src $(dkms_dir)/headers @@ -129,15 +136,17 @@ override_dh_auto_install: prepare-dkms $(flavours) 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-440-modules="nvidia-dkms-440 (= $(dkms_nvidia_440_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-440="nvidia-kernel-common-440 (<= $(nvidia_440_upstream_version)-1), nvidia-kernel-common-440 (>= $(nvidia_440_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))" +gencontrol_flags += -Vnvk:nvidia-450-server="nvidia-kernel-common-450-server (<= $(nvidia_450_server_upstream_version)-1), nvidia-kernel-common-450-server (>= $(nvidia_450_server_upstream_version))" override_dh_gencontrol: dh_gencontrol -- $(gencontrol_flags) From patchwork Tue Aug 25 15:47:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Milone X-Patchwork-Id: 1351140 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 4BbYLM0ggxz9sTN; Wed, 26 Aug 2020 01:48:27 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1kAbBP-00021a-Ov; Tue, 25 Aug 2020 15:48:23 +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 1kAbBO-00020v-BG for kernel-team@lists.ubuntu.com; Tue, 25 Aug 2020 15:48:22 +0000 Received: from mail-wr1-f72.google.com ([209.85.221.72]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kAbBO-0001cY-2z for kernel-team@lists.ubuntu.com; Tue, 25 Aug 2020 15:48:22 +0000 Received: by mail-wr1-f72.google.com with SMTP id f7so5273318wrs.8 for ; Tue, 25 Aug 2020 08:48:22 -0700 (PDT) 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=M5tcODnnXSylxSYKTMSf3J2D4XMl/vo5oNAfh+BC/vE=; b=tV8CB48LXFlqWeGv8RsB05yMWRTtKQIHehNlJjp5XV5I3euXrUKBY2dlJ3s6a9T46W JvEZZKTpzKSOHeTBCyf+kEi0VbJU+DQ9GvB885W50N642UrK31hCA+Gj5FFAi3l79EsR SIMBGQOJRLFcMGbBRsylTcAIqy9ONc79QXvvUT3qaosY0kBRJtncJG152vkWYC8RD6LI piTdsWF7hixJlTVWC2I5ZF/U/zx0TbKeieDoDyM6ZqBVtdeI4ru9dJ4P+0bsRUhdFwpM 53P0Lh/sh4arSVLBXEnf3P9rXvAaSRHpdjDuLyxUcChajneQfAuTQ1YlyOdPubEjhT4I XYbQ== X-Gm-Message-State: AOAM5328Lrf134N2/R0VJHbZObEn0dk1hC931wKQS5Ji3doUneWPqKKk P8WvJpj33AP19umTC/6kP/WM7iJFbVjsw1jH/wNdx7gK+3mA/be9eA32SajQTgO2ihDiKI+8A3Q 4Yydx8ylarsmuYjy7cMfZEAAN/IL0w59T3uxXmoUHAA== X-Received: by 2002:a05:600c:287:: with SMTP id 7mr2625450wmk.101.1598370501350; Tue, 25 Aug 2020 08:48:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzgGAj1KTLDThwdiTAfDImDkcoVdJr9FiuEiHl0Lpw1xEDnEvnKBK8H3MwMtq7kDKsHzoSEpg== X-Received: by 2002:a05:600c:287:: with SMTP id 7mr2625419wmk.101.1598370501023; Tue, 25 Aug 2020 08:48:21 -0700 (PDT) Received: from thinkpad.lan (dynamic-adsl-94-34-39-30.clienti.tiscali.it. [94.34.39.30]) by smtp.gmail.com with ESMTPSA id h14sm7115715wml.30.2020.08.25.08.48.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 08:48:20 -0700 (PDT) From: Alberto Milone To: kernel-team@lists.ubuntu.com Subject: [PATCH 3/10 B][SRU][Hwe] UBUNTU: [packaging] add signed modules for nvidia 418-server 440-server Date: Tue, 25 Aug 2020 17:47:49 +0200 Message-Id: <20200825154756.3753617-4-alberto.milone@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200825154756.3753617-1-alberto.milone@canonical.com> References: <20200825154756.3753617-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" Enable building only on amd64 using the do_dkms_nvidia_server flag. Also, modify the regular expression in 2-binary-arch.mk, so that names such as nvidia-440srv are allowed. BugLink: https://bugs.launchpad.net/bugs/1881137 --- debian.master/rules.d/amd64.mk | 1 + debian/dkms-versions | 2 ++ debian/rules | 11 ++++++++--- debian/rules.d/2-binary-arch.mk | 5 +++++ debian/scripts/dkms-build | 2 +- 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/debian.master/rules.d/amd64.mk b/debian.master/rules.d/amd64.mk index b1f62a796c22..d253402ae066 100644 --- a/debian.master/rules.d/amd64.mk +++ b/debian.master/rules.d/amd64.mk @@ -23,5 +23,6 @@ do_tools_common = true do_tools_acpidbg = true do_zfs = true do_dkms_nvidia = true +do_dkms_nvidia_server = true do_dkms_vbox = true do_dkms_wireguard = true diff --git a/debian/dkms-versions b/debian/dkms-versions index 93c5b2e2efbe..f4b24c7f87e3 100644 --- a/debian/dkms-versions +++ b/debian/dkms-versions @@ -2,5 +2,7 @@ zfs-linux 0.8.1-1ubuntu14.4 nvidia-graphics-drivers-390 390.138-0ubuntu0.19.10.1 nvidia-graphics-drivers-440 440.100-0ubuntu0.19.10.1 nvidia-graphics-drivers-435 435.21-0ubuntu2 +nvidia-graphics-drivers-418-server 0 +nvidia-graphics-drivers-440-server 0 virtualbox 6.0.14-dfsg-1 wireguard-linux-compat 1.0.20200611-1ubuntu1~19.10.1 diff --git a/debian/rules b/debian/rules index be87007d6ac1..5884455e0f4f 100755 --- a/debian/rules +++ b/debian/rules @@ -45,6 +45,7 @@ ifneq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH)) disable_d_i=true do_zfs=false do_dkms_nvidia=false + do_dkms_nvidia_server=false do_dkms_vbox=false do_dkms_wireguard=false endif @@ -80,6 +81,7 @@ ifneq ($(filter autopkgtest,$(DEB_BUILD_PROFILES)),) disable_d_i=true do_zfs=false do_dkms_nvidia=false + do_dkms_nvidia_server=false do_dkms_vbox=false endif @@ -90,6 +92,7 @@ ifeq ($(do_mainline_build),true) no_dumpfile=1 do_zfs=false do_dkms_nvidia=false + do_dkms_nvidia_server=false do_dkms_vbox=false skipabi=true skipmodule=true @@ -121,9 +124,11 @@ do_any_tools=$(sort $(filter-out false,$(do_linux_tools) $(do_cloud_tools))) # Versions of dkms packages. dkms_zfs_linux_version=$(shell gawk '/^zfs-linux / { print $$2; }' debian/dkms-versions) -dkms_nvidia_390_version=$(shell gawk '/^nvidia-graphics-drivers-390/ { print $$2; }' debian/dkms-versions) -dkms_nvidia_440_version=$(shell gawk '/^nvidia-graphics-drivers-440/ { print $$2; }' debian/dkms-versions) -dkms_nvidia_435_version=$(shell gawk '/^nvidia-graphics-drivers-435/ { 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) +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_vbox_guest_version=$(shell gawk '/^virtualbox/ { print $$2; }' debian/dkms-versions) dkms_wireguard_version=$(shell gawk '/^wireguard-linux-compat / { print $$2; }' debian/dkms-versions) diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 72adce739413..81f93f249b83 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -404,6 +404,11 @@ ifeq ($(do_dkms_nvidia),true) $(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) endif +ifeq ($(do_dkms_nvidia_server),true) + $(call build_dkms, $(bldinfo_pkg_name)-$*, $(pkgdir_bldinfo)/usr/lib/linux/$(abi_release)-$*/signatures, "", nvidia-418srv, pool/restricted/n/nvidia-graphics-drivers-418-server/nvidia-kernel-source-418-server_$(dkms_nvidia_418_server_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-418-server/nvidia-dkms-418-server_$(dkms_nvidia_418_server_version)_$(arch).deb) + $(call build_dkms, $(bldinfo_pkg_name)-$*, $(pkgdir_bldinfo)/usr/lib/linux/$(abi_release)-$*/signatures, "", nvidia-440srv, pool/restricted/n/nvidia-graphics-drivers-440-server/nvidia-kernel-source-440-server_$(dkms_nvidia_440_server_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-440-server/nvidia-dkms-440-server_$(dkms_nvidia_440_server_version)_$(arch).deb) +endif + ifeq ($(do_extras_package),true) $(if $(filter true,$(do_dkms_vbox)),$(call build_dkms, $(mods_pkg_name)-$*, $(pkgdir)/lib/modules/$(abi_release)-$*/kernel, "", virtualbox-guest, pool/multiverse/v/virtualbox/virtualbox-guest-dkms_$(dkms_vbox_guest_version)_all.deb)) endif diff --git a/debian/scripts/dkms-build b/debian/scripts/dkms-build index 638b3122a05d..c1751ffaa016 100755 --- a/debian/scripts/dkms-build +++ b/debian/scripts/dkms-build @@ -234,7 +234,7 @@ done # as squirreled away, and the log in case it is useful. Finally pass a formed # signing command line in case we need to do that. dkms_build_specific="$srcdir/$0--$package" -dkms_build_generic=$(echo "$dkms_build_specific" | sed -n -e 's/-[0-9][0-9]*$/-N/p') +dkms_build_generic=$(echo "$dkms_build_specific" | sed -n -e 's/-[0-9][0-9]*[a-z]*$/-N/p') for dkms_build in "$dkms_build_specific" "$dkms_build_generic" do if [ -z "$dkms_build" -o ! -e "$dkms_build" ]; then From patchwork Tue Aug 25 15:47:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Milone X-Patchwork-Id: 1351141 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 4BbYLR2Twmz9sTN; Wed, 26 Aug 2020 01:48:31 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1kAbBU-00023x-1u; Tue, 25 Aug 2020 15:48:28 +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 1kAbBR-00022Y-FU for kernel-team@lists.ubuntu.com; Tue, 25 Aug 2020 15:48:25 +0000 Received: from mail-wr1-f69.google.com ([209.85.221.69]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kAbBR-0001d0-80 for kernel-team@lists.ubuntu.com; Tue, 25 Aug 2020 15:48:25 +0000 Received: by mail-wr1-f69.google.com with SMTP id r11so5164927wrj.0 for ; Tue, 25 Aug 2020 08:48:25 -0700 (PDT) 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=hUK0dhCrIo4uFbmrFNAG3TMQMZ72xKbQJBS4JNHAywI=; b=idy5e2d9J9z+dAwHQ/B+QkKIBwm+UL5g2+j5/1ZcRPv5MfxmBuJWbfMtLVQfvL63Z+ nkHuAUCYqt9guNvhK7wUbaMjLQuHBohUbRoqf6vIwns0qck/KWhpyoeUbsP/5BBWVMNB KWX8nMq0Hl+MXuqnHUApK1LJ0+MzE8kC8wnG5JfsETQwyRDbPKutAtGuF1DjDAuKGA9z RcH46FNm04WoCElKRjvNidJ/MFJoGEi25nFGOBJxS9R0Vy/LWs1/M1KzCZRDNDQyC5B9 mgiE8w4VUkioDpXUtt3teqbfugetIj+2Y1ZfWrEaADPxKe7bipN6NKaqSt2/DBaimb4T H9kg== X-Gm-Message-State: AOAM531TBDnGIuH7xQBqM27Jmd/vhqr+3IKY375jp3zCTlRTClJwRoky QWSUmnFB/1YkI4/CwBie1HYTAN4pbTfJ6XF2/QoXj3YoiSl+W1T2vR+i9AZIzGtgwPEFhWgOgk7 wAicuvN43fs41prabgw6aXnVUEFayL9fz7QnD4vtA1g== X-Received: by 2002:a5d:5084:: with SMTP id a4mr11657434wrt.191.1598370504422; Tue, 25 Aug 2020 08:48:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzk46TNqxRw+2CYMIaBqJpxJEkakJOFBWiwiNQv5Oaymx5d8fop5BKBopCWUOxiEY3AKIc9EA== X-Received: by 2002:a5d:5084:: with SMTP id a4mr11657404wrt.191.1598370504097; Tue, 25 Aug 2020 08:48:24 -0700 (PDT) Received: from thinkpad.lan (dynamic-adsl-94-34-39-30.clienti.tiscali.it. [94.34.39.30]) by smtp.gmail.com with ESMTPSA id h14sm7115715wml.30.2020.08.25.08.48.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 08:48:23 -0700 (PDT) From: Alberto Milone To: kernel-team@lists.ubuntu.com Subject: [PATCH 4/10 B][SRU][Hwe] UBUNTU: [packaging] add signed modules for 450 and 450-server Date: Tue, 25 Aug 2020 17:47:50 +0200 Message-Id: <20200825154756.3753617-5-alberto.milone@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200825154756.3753617-1-alberto.milone@canonical.com> References: <20200825154756.3753617-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" While the 450 series replaces the 440 series, the 450-server series is only an addition to the 440-server series. BugLink: https://bugs.launchpad.net/bugs/1887674 Signed-off-by: Alberto Milone --- debian/dkms-versions | 3 ++- debian/rules | 3 ++- debian/rules.d/2-binary-arch.mk | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/dkms-versions b/debian/dkms-versions index f4b24c7f87e3..fe4c8e11b6d6 100644 --- a/debian/dkms-versions +++ b/debian/dkms-versions @@ -1,8 +1,9 @@ zfs-linux 0.8.1-1ubuntu14.4 nvidia-graphics-drivers-390 390.138-0ubuntu0.19.10.1 -nvidia-graphics-drivers-440 440.100-0ubuntu0.19.10.1 nvidia-graphics-drivers-435 435.21-0ubuntu2 +nvidia-graphics-drivers-450 0 nvidia-graphics-drivers-418-server 0 nvidia-graphics-drivers-440-server 0 +nvidia-graphics-drivers-450-server 0 virtualbox 6.0.14-dfsg-1 wireguard-linux-compat 1.0.20200611-1ubuntu1~19.10.1 diff --git a/debian/rules b/debian/rules index 5884455e0f4f..0d2ed31a824a 100755 --- a/debian/rules +++ b/debian/rules @@ -126,9 +126,10 @@ do_any_tools=$(sort $(filter-out false,$(do_linux_tools) $(do_cloud_tools))) dkms_zfs_linux_version=$(shell gawk '/^zfs-linux / { 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) +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) dkms_vbox_guest_version=$(shell gawk '/^virtualbox/ { print $$2; }' debian/dkms-versions) dkms_wireguard_version=$(shell gawk '/^wireguard-linux-compat / { print $$2; }' debian/dkms-versions) diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 81f93f249b83..06f552484438 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -400,13 +400,14 @@ endif 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_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-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) $(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-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) endif ifeq ($(do_dkms_nvidia_server),true) $(call build_dkms, $(bldinfo_pkg_name)-$*, $(pkgdir_bldinfo)/usr/lib/linux/$(abi_release)-$*/signatures, "", nvidia-418srv, pool/restricted/n/nvidia-graphics-drivers-418-server/nvidia-kernel-source-418-server_$(dkms_nvidia_418_server_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-418-server/nvidia-dkms-418-server_$(dkms_nvidia_418_server_version)_$(arch).deb) $(call build_dkms, $(bldinfo_pkg_name)-$*, $(pkgdir_bldinfo)/usr/lib/linux/$(abi_release)-$*/signatures, "", nvidia-440srv, pool/restricted/n/nvidia-graphics-drivers-440-server/nvidia-kernel-source-440-server_$(dkms_nvidia_440_server_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-440-server/nvidia-dkms-440-server_$(dkms_nvidia_440_server_version)_$(arch).deb) + $(call build_dkms, $(bldinfo_pkg_name)-$*, $(pkgdir_bldinfo)/usr/lib/linux/$(abi_release)-$*/signatures, "", nvidia-450srv, pool/restricted/n/nvidia-graphics-drivers-450-server/nvidia-kernel-source-450-server_$(dkms_nvidia_450_server_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-450-server/nvidia-dkms-450-server_$(dkms_nvidia_450_server_version)_$(arch).deb) endif ifeq ($(do_extras_package),true) From patchwork Tue Aug 25 15:47:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Milone X-Patchwork-Id: 1351142 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 4BbYLl058tz9sTN; Wed, 26 Aug 2020 01:48:47 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1kAbBe-00028d-8U; Tue, 25 Aug 2020 15:48:38 +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 1kAbBc-00028A-2l for kernel-team@lists.ubuntu.com; Tue, 25 Aug 2020 15:48:36 +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 1kAbBb-0001eH-QU for kernel-team@lists.ubuntu.com; Tue, 25 Aug 2020 15:48:35 +0000 Received: by mail-wm1-f69.google.com with SMTP id c186so1079280wmd.9 for ; Tue, 25 Aug 2020 08:48:35 -0700 (PDT) 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=2KQ6Spj/sql2D376AlNQN10qwNPfeOdjsPtoVA+8Y2Y=; b=HXXqHJcTZ0ioS3aL7EzU+8U2+xOSPdL0qXm1FtC0mJPjRi16fnt2pEcINKO2gB2in4 EQsijDLqv2FhW4okT5SVoGewUBiUqYyuEvHp7DGUkwtri/KYCFDtOJnAxEoZ8sjUyfD0 EgqiXjhOJpqa5CgRCthdZCJAaGAUmHDcwiYVZUUh5xZvci08vXh2xNwGMlYCoizCgZl/ fv6KIA64A3fjF0GpYCGOnFzfx8JEmM1W3cUSz6PrxYIDGMXgOcnmB/NloeoaZlW0DjC9 HyQtZSkWQ5sCJ5H84i2iO2xYknaB+IqxAf4BwAG6i6A2GllPsLuRNLeZB/f9jMIoprTL XPXA== X-Gm-Message-State: AOAM530JSs1gYY0uWTPrTkQEeJl7AhYHn4hXssQQwoJKyDcDZxvtwG3L b9AOgc/GVaRjm4MIv7rIzq7wv7L75+36L6ImoHOupvHwlVgTai9AsxSdke7riNCwOXlNmSL44qo zF9QSXxLbzC/od1cSRYkcGELYqXMzW0B764qoOwS7pw== X-Received: by 2002:a1c:e006:: with SMTP id x6mr2841720wmg.128.1598370513893; Tue, 25 Aug 2020 08:48:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyba7/9CPLd0I28HnZZABrnkqlRVIU1OiR746PUYLdH/SypBlDQzHTLvgHPKGTLy923bGYkiQ== X-Received: by 2002:a1c:e006:: with SMTP id x6mr2841636wmg.128.1598370512560; Tue, 25 Aug 2020 08:48:32 -0700 (PDT) Received: from thinkpad.lan (dynamic-adsl-94-34-39-30.clienti.tiscali.it. [94.34.39.30]) by smtp.gmail.com with ESMTPSA id h14sm7115715wml.30.2020.08.25.08.48.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 08:48:31 -0700 (PDT) From: Alberto Milone To: kernel-team@lists.ubuntu.com Subject: [PATCH 5/10][SRU][Hwe-5.4][L-R-M] UBUNTU: [packaging] add nvidia 450 and 450-server drivers Date: Tue, 25 Aug 2020 17:47:51 +0200 Message-Id: <20200825154756.3753617-6-alberto.milone@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200825154756.3753617-1-alberto.milone@canonical.com> References: <20200825154756.3753617-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" While the 450 series replaces the 440 series (through transitional packages), the 450-server series is only an addition to the 440-server series. This requires calling the update-version script when cranking. BugLink: https://bugs.launchpad.net/bugs/1887674 Signed-off-by: Alberto Milone --- debian/control.d/meta-nvidia | 50 +++++++++++++++++------ debian/control.d/nvidia | 46 +++++++++++++++++++-- debian/control.d/transitionals-nvidia-440 | 13 ++++++ debian/control.d/upgrade-meta-nvidia-440 | 17 ++++++++ debian/dkms-versions | 3 +- debian/rules | 25 ++++++++---- 6 files changed, 129 insertions(+), 25 deletions(-) create mode 100644 debian/control.d/transitionals-nvidia-440 create mode 100644 debian/control.d/upgrade-meta-nvidia-440 diff --git a/debian/control.d/meta-nvidia b/debian/control.d/meta-nvidia index 35f38f5..3cb0f94 100644 --- a/debian/control.d/meta-nvidia +++ b/debian/control.d/meta-nvidia @@ -24,17 +24,17 @@ Description: Extra drivers for nvidia-435 for generic${variant:suffix} Install extra signed nvidia-435 modules compatible with generic${variant:suffix} -Package: linux-modules-nvidia-440-generic${variant:suffix} +Package: linux-modules-nvidia-450-generic${variant:suffix} Build-Profiles: Architecture: amd64 Section: kernel -Provides: ${dkms:nvidia-440-modules} +Provides: ${dkms:nvidia-450-modules} Depends: ${misc:Depends}, - linux-modules-nvidia-440-@ABI@-generic (= ${binary:Version}), - ${nvk:nvidia-440} -Description: Extra drivers for nvidia-440 for generic${variant:suffix} - Install extra signed nvidia-440 modules compatible with + linux-modules-nvidia-450-@ABI@-generic (= ${binary:Version}), + ${nvk:nvidia-450} +Description: Extra drivers for nvidia-450 for generic${variant:suffix} + Install extra signed nvidia-450 modules compatible with generic${variant:suffix} Package: linux-modules-nvidia-418-server-generic${variant:suffix} @@ -63,6 +63,19 @@ Description: Extra drivers for nvidia-440-server for generic${variant:suffix} Install extra signed nvidia-440-server modules compatible with generic${variant:suffix} +Package: linux-modules-nvidia-450-server-generic${variant:suffix} +Build-Profiles: +Architecture: amd64 +Section: kernel +Provides: ${dkms:nvidia-450-server-modules} +Depends: + ${misc:Depends}, + linux-modules-nvidia-450-server-@ABI@-generic (= ${binary:Version}), + ${nvk:nvidia-450-server} +Description: Extra drivers for nvidia-450-server for generic${variant:suffix} + Install extra signed nvidia-450-server modules compatible with + generic${variant:suffix} + Package: linux-modules-nvidia-390-lowlatency${variant:suffix} Build-Profiles: Architecture: amd64 @@ -89,17 +102,17 @@ Description: Extra drivers for nvidia-435 for lowlatency${variant:suffix} Install extra signed nvidia-435 modules compatible with lowlatency${variant:suffix} -Package: linux-modules-nvidia-440-lowlatency${variant:suffix} +Package: linux-modules-nvidia-450-lowlatency${variant:suffix} Build-Profiles: Architecture: amd64 Section: kernel -Provides: ${dkms:nvidia-440-modules} +Provides: ${dkms:nvidia-450-modules} Depends: ${misc:Depends}, - linux-modules-nvidia-440-@ABI@-lowlatency (= ${binary:Version}), - ${nvk:nvidia-440} -Description: Extra drivers for nvidia-440 for lowlatency${variant:suffix} - Install extra signed nvidia-440 modules compatible with + linux-modules-nvidia-450-@ABI@-lowlatency (= ${binary:Version}), + ${nvk:nvidia-450} +Description: Extra drivers for nvidia-450 for lowlatency${variant:suffix} + Install extra signed nvidia-450 modules compatible with lowlatency${variant:suffix} Package: linux-modules-nvidia-418-server-lowlatency${variant:suffix} @@ -127,3 +140,16 @@ Depends: Description: Extra drivers for nvidia-440-server for lowlatency${variant:suffix} Install extra signed nvidia-440-server modules compatible with lowlatency${variant:suffix} + +Package: linux-modules-nvidia-450-server-lowlatency${variant:suffix} +Build-Profiles: +Architecture: amd64 +Section: kernel +Provides: ${dkms:nvidia-450-server-modules} +Depends: + ${misc:Depends}, + linux-modules-nvidia-450-server-@ABI@-lowlatency (= ${binary:Version}), + ${nvk:nvidia-450-server} +Description: Extra drivers for nvidia-450-server for lowlatency${variant:suffix} + Install extra signed nvidia-450-server modules compatible with + lowlatency${variant:suffix} diff --git a/debian/control.d/nvidia b/debian/control.d/nvidia index c2a012d..383c55d 100644 --- a/debian/control.d/nvidia +++ b/debian/control.d/nvidia @@ -36,7 +36,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-440-@ABI@-generic +Package: linux-modules-nvidia-450-@ABI@-generic Build-Profiles: Architecture: amd64 Section: kernel @@ -51,7 +51,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-440-generic* meta-packages, + one of the linux-modules-nvidia-450-generic* meta-packages, which will ensure that upgrades work correctly, and that supporting packages are also installed. @@ -93,6 +93,25 @@ 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-450-server-@ABI@-generic +Build-Profiles: +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, +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-450-server-generic* meta-packages, + which will ensure that upgrades work correctly, and that supporting packages are + also installed. + Package: linux-modules-nvidia-390-@ABI@-lowlatency Build-Profiles: Architecture: amd64 @@ -131,7 +150,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-440-@ABI@-lowlatency +Package: linux-modules-nvidia-450-@ABI@-lowlatency Build-Profiles: Architecture: amd64 Section: kernel @@ -146,7 +165,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-440-lowlatency* meta-packages, + one of the linux-modules-nvidia-450-lowlatency* meta-packages, which will ensure that upgrades work correctly, and that supporting packages are also installed. @@ -187,3 +206,22 @@ Description: Linux kernel nvidia modules for version @ABI@ one of the linux-modules-nvidia-440-server-lowlatency* meta-packages, which will ensure that upgrades work correctly, and that supporting packages are also installed. + +Package: linux-modules-nvidia-450-server-@ABI@-lowlatency +Build-Profiles: +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, +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-450-server-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-440 b/debian/control.d/transitionals-nvidia-440 new file mode 100644 index 0000000..987ecad --- /dev/null +++ b/debian/control.d/transitionals-nvidia-440 @@ -0,0 +1,13 @@ +Package: linux-modules-nvidia-440-generic +Architecture: amd64 +Section: oldlibs +Depends: linux-modules-nvidia-450-generic +Description: Extra drivers for nvidia-440 for the generic flavour (dummy transitional package) + Transitional package for upgrades of -440 to -450. + +Package: linux-modules-nvidia-440-lowlatency +Architecture: amd64 +Section: oldlibs +Depends: linux-modules-nvidia-450-lowlatency +Description: Extra drivers for nvidia-440 for the generic flavour (dummy transitional package) + Transitional package for upgrades of -440 to -450. diff --git a/debian/control.d/upgrade-meta-nvidia-440 b/debian/control.d/upgrade-meta-nvidia-440 new file mode 100644 index 0000000..bf8b527 --- /dev/null +++ b/debian/control.d/upgrade-meta-nvidia-440 @@ -0,0 +1,17 @@ +Package: linux-modules-nvidia-440-generic${variant:suffix} +Build-Profiles: +Architecture: amd64 +Section: kernel +Depends: linux-modules-nvidia-450-generic${variant:suffix} +Description: Transitional package for linux-modules-nvidia-450-generic${variant:suffix} + This is a transitional package for linux-modules-nvidia-450-generic${variant:suffix}, + and can be safely removed after the installation is complete. + +Package: linux-modules-nvidia-440-lowlatency${variant:suffix} +Build-Profiles: +Architecture: amd64 +Section: kernel +Depends: linux-modules-nvidia-450-lowlatency${variant:suffix} +Description: Transitional package for linux-modules-nvidia-450-lowlatency${variant:suffix} + This is a transitional package for linux-modules-nvidia-450-lowlatency${variant:suffix}, + and can be safely removed after the installation is complete. diff --git a/debian/dkms-versions b/debian/dkms-versions index 6873db2..c372439 100644 --- a/debian/dkms-versions +++ b/debian/dkms-versions @@ -1,8 +1,9 @@ zfs-linux 0.8.3-1ubuntu12.2 nvidia-graphics-drivers-390 390.138-0ubuntu0.20.04.1 nvidia-graphics-drivers-435 435.21-0ubuntu7 -nvidia-graphics-drivers-440 440.100-0ubuntu0.20.04.1 +nvidia-graphics-drivers-450 0 nvidia-graphics-drivers-418-server 418.152.00-0ubuntu0.20.04.1 nvidia-graphics-drivers-440-server 440.95.01-0ubuntu0.20.04.1 +nvidia-graphics-drivers-450-server 0 virtualbox 6.1.10-dfsg-1~ubuntu1.20.04.1 wireguard-linux-compat 1.0.20200611-1ubuntu1~20.04.1 diff --git a/debian/rules b/debian/rules index 3940bbf..91dcab6 100755 --- a/debian/rules +++ b/debian/rules @@ -15,15 +15,17 @@ 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_440_version=$(shell gawk '/^nvidia-graphics-drivers-440 / { 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_440_upstream_version=$(shell echo "$(dkms_nvidia_440_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) +nvidia_450_server_upstream_version=$(shell echo "$(dkms_nvidia_450_server_version)" | cut -d '-' -f 1) # Get variants, assuming primary if debian/variants is not present variants = -- @@ -143,10 +145,10 @@ nvidia-%: $(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-440-$(src_abi)-$* - install -d debian/linux-modules-nvidia-440-$(src_abi)-$*/usr/lib/linux/triggers - $(call build_dkms, $(src_abi)-$*, linux-modules-nvidia-440-$(src_abi)-$*, $(CURDIR)/debian/linux-modules-nvidia-440-$(src_abi)-$*/lib/modules/$(src_abi)-$*/kernel, "", 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) - $(call install_control,linux-modules-nvidia-440-$(src_abi)-$*,$*,nvidia,440,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 + $(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) install -d debian/linux-modules-nvidia-418-server-$(src_abi)-$* install -d debian/linux-modules-nvidia-418-server-$(src_abi)-$*/usr/lib/linux/triggers @@ -158,6 +160,11 @@ nvidia-%: $(call build_dkms, $(src_abi)-$*, linux-modules-nvidia-440-server-$(src_abi)-$*, $(CURDIR)/debian/linux-modules-nvidia-440-server-$(src_abi)-$*/lib/modules/$(src_abi)-$*/kernel, "", nvidia-440srv, pool/restricted/n/nvidia-graphics-drivers-440-server/nvidia-kernel-source-440-server_$(dkms_nvidia_440_server_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-440-server/nvidia-dkms-440-server_$(dkms_nvidia_440_server_version)_$(arch).deb) $(call install_control,linux-modules-nvidia-440-server-$(src_abi)-$*,$*,nvidia,440srv,postinst postrm prerm config templates) + install -d debian/linux-modules-nvidia-450-server-$(src_abi)-$* + install -d debian/linux-modules-nvidia-450-server-$(src_abi)-$*/usr/lib/linux/triggers + $(call build_dkms, $(src_abi)-$*, linux-modules-nvidia-450-server-$(src_abi)-$*, $(CURDIR)/debian/linux-modules-nvidia-450-server-$(src_abi)-$*/lib/modules/$(src_abi)-$*/kernel, "", nvidia-450srv, pool/restricted/n/nvidia-graphics-drivers-450-server/nvidia-kernel-source-450-server_$(dkms_nvidia_450_server_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-450-server/nvidia-dkms-450-server_$(dkms_nvidia_450_server_version)_$(arch).deb) + $(call install_control,linux-modules-nvidia-450-server-$(src_abi)-$*,$*,nvidia,450srv,postinst postrm prerm config templates) + prepare-dkms: mkdir -p $(dkms_dir) ln -s /usr/src $(dkms_dir)/headers @@ -171,15 +178,17 @@ 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-440-modules="nvidia-dkms-440 (= $(dkms_nvidia_440_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-440="nvidia-kernel-common-440 (<= $(nvidia_440_upstream_version)-1), nvidia-kernel-common-440 (>= $(nvidia_440_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))" +gencontrol_flags += -Vnvk:nvidia-450-server="nvidia-kernel-common-450-server (<= $(nvidia_450_server_upstream_version)-1), nvidia-kernel-common-450-server (>= $(nvidia_450_server_upstream_version))" override_dh_gencontrol: dh_gencontrol -- $(gencontrol_flags) From patchwork Tue Aug 25 15:47:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Milone X-Patchwork-Id: 1351143 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 4BbYLl2Ypmz9sTX; Wed, 26 Aug 2020 01:48:47 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1kAbBk-0002Au-Gz; Tue, 25 Aug 2020 15:48:44 +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 1kAbBh-00029w-Mf for kernel-team@lists.ubuntu.com; Tue, 25 Aug 2020 15:48:41 +0000 Received: from mail-wm1-f70.google.com ([209.85.128.70]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kAbBh-0001eu-FB for kernel-team@lists.ubuntu.com; Tue, 25 Aug 2020 15:48:41 +0000 Received: by mail-wm1-f70.google.com with SMTP id q23so1097794wmj.0 for ; Tue, 25 Aug 2020 08:48:41 -0700 (PDT) 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=veRWOJtK9UHMdN/fBxF/rZIYV71ElOtCZxtUBUox0hg=; b=mQLjuBq4CVd1C+O8T7SMP5DMWsYxaz4qRtnzAPTIn8JGPNdoilHw6/K65KnKJW2W1L Pw60HutAyqFXn1xbQFAskMrM2v/mLzNmPUo2dqawprvOe6nqyAWZxAnrTX28SkdGjnwB 6xC1kfDyUPJo/mth7Fi6Kh0Nj8T48mZycobkIePhKsscZVQl2pndm0s6Ig/GbxhXk7an Uo8ba55uXZ0A0om4hiwFyXzWnrBRK6EJlp0X6NxGQ8GRQu/KffrqEzU+e58euJtGQYk7 LiH/NFPB36id1eM8QQ3AItxNNetdrsSzrXSwrqBSmHawdu1uhiwqVlZ1Y/0G3GEtqnLr 00aw== X-Gm-Message-State: AOAM532NF0Qm9r+ySFg7JvGWF0M0UlOzKkaoIH1oLiNhDjhtY6EZ6RLd S165E3CXH+HNWe3uF1uRqlQlxtF44Wwdf1qQwjj6Yh736IMAHg71E2ypIg309L3MLH+mTAnywSW N/N52qy66JspTW5yXcwO1cn/bmow8vKBMNJbEG/vB4w== X-Received: by 2002:a1c:e20a:: with SMTP id z10mr2642797wmg.65.1598370517744; Tue, 25 Aug 2020 08:48:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx5FOwra8E8JKmBOHDZP8TfBBkwOrqzZbMqKX9wcSbeLHQw119DjTOV/IDXkEEpIqye1q78Cg== X-Received: by 2002:a1c:e20a:: with SMTP id z10mr2642766wmg.65.1598370517422; Tue, 25 Aug 2020 08:48:37 -0700 (PDT) Received: from thinkpad.lan (dynamic-adsl-94-34-39-30.clienti.tiscali.it. [94.34.39.30]) by smtp.gmail.com with ESMTPSA id h14sm7115715wml.30.2020.08.25.08.48.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 08:48:36 -0700 (PDT) From: Alberto Milone To: kernel-team@lists.ubuntu.com Subject: [PATCH 6/10][SRU][Aws-5.3][L-R-M] UBUNTU: [packaging] Replace nvidia 440 with 450 Date: Tue, 25 Aug 2020 17:47:52 +0200 Message-Id: <20200825154756.3753617-7-alberto.milone@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200825154756.3753617-1-alberto.milone@canonical.com> References: <20200825154756.3753617-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" The 450 series replaces the 440 series, which we are adding transitional packages for. BugLink: https://bugs.launchpad.net/bugs/1887674 Signed-off-by: Alberto Milone --- debian/control.d/meta-nvidia | 12 ++++++------ debian/control.d/nvidia | 4 ++-- debian/control.d/transitionals-nvidia-440 | 6 ++++++ debian/dkms-versions | 2 +- debian/rules | 16 ++++++++-------- 5 files changed, 23 insertions(+), 17 deletions(-) create mode 100644 debian/control.d/transitionals-nvidia-440 diff --git a/debian/control.d/meta-nvidia b/debian/control.d/meta-nvidia index 08edc3b..2105266 100644 --- a/debian/control.d/meta-nvidia +++ b/debian/control.d/meta-nvidia @@ -24,15 +24,15 @@ Description: Extra drivers for nvidia-435 for aws${variant:suffix} Install extra signed nvidia-435 modules compatible with aws${variant:suffix} -Package: linux-modules-nvidia-440-aws${variant:suffix} +Package: linux-modules-nvidia-450-aws${variant:suffix} Build-Profiles: Architecture: amd64 Section: kernel -Provides: ${dkms:nvidia-440-modules} +Provides: ${dkms:nvidia-450-modules} Depends: ${misc:Depends}, - linux-modules-nvidia-440-@ABI@-aws (= ${binary:Version}), - ${nvk:nvidia-440} -Description: Extra drivers for nvidia-440 for aws${variant:suffix} - Install extra signed nvidia-440 modules compatible with + linux-modules-nvidia-450-@ABI@-aws (= ${binary:Version}), + ${nvk:nvidia-450} +Description: Extra drivers for nvidia-450 for aws${variant:suffix} + Install extra signed nvidia-450 modules compatible with aws${variant:suffix} diff --git a/debian/control.d/nvidia b/debian/control.d/nvidia index 24b8ac7..d0f79d8 100644 --- a/debian/control.d/nvidia +++ b/debian/control.d/nvidia @@ -36,7 +36,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-440-@ABI@-aws +Package: linux-modules-nvidia-450-@ABI@-aws Build-Profiles: Architecture: amd64 Section: kernel @@ -51,6 +51,6 @@ 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-440-aws* meta-packages, + one of the linux-modules-nvidia-450-aws* meta-packages, which will ensure that upgrades work correctly, and that supporting packages are also installed. diff --git a/debian/control.d/transitionals-nvidia-440 b/debian/control.d/transitionals-nvidia-440 new file mode 100644 index 0000000..e476eb4 --- /dev/null +++ b/debian/control.d/transitionals-nvidia-440 @@ -0,0 +1,6 @@ +Package: linux-modules-nvidia-440-aws +Architecture: amd64 +Section: oldlibs +Depends: linux-modules-nvidia-450-aws +Description: Extra drivers for nvidia-440 for the aws flavour (dummy transitional package) + Transitional package for upgrades of -440 to -450. diff --git a/debian/dkms-versions b/debian/dkms-versions index 0f282cc..1722c91 100644 --- a/debian/dkms-versions +++ b/debian/dkms-versions @@ -2,7 +2,7 @@ spl-linux 0.7.5-1ubuntu2.2 zfs-linux 0.7.5-1ubuntu16.9 nvidia-graphics-drivers-390 390.138-0ubuntu0.18.04.1 nvidia-graphics-drivers-435 435.21-0ubuntu0.18.04.3 -nvidia-graphics-drivers-440 440.100-0ubuntu0.18.04.1 +nvidia-graphics-drivers-450 0 nvidia-graphics-drivers-418-server 418.152.00-0ubuntu0.18.04.1 nvidia-graphics-drivers-440-server 440.95.01-0ubuntu0.18.04.1 wireguard-linux-compat 1.0.20200611-1ubuntu1~18.04.1 diff --git a/debian/rules b/debian/rules index cefbaee..3b43821 100755 --- a/debian/rules +++ b/debian/rules @@ -15,11 +15,11 @@ 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_440_version=$(shell gawk '/^nvidia-graphics-drivers-440 / { print $$2; }' debian/dkms-versions) +dkms_nvidia_450_version=$(shell gawk '/^nvidia-graphics-drivers-450 / { 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_440_upstream_version=$(shell echo "$(dkms_nvidia_440_version)" | cut -d '-' -f 1) +nvidia_450_upstream_version=$(shell echo "$(dkms_nvidia_450_version)" | cut -d '-' -f 1) # Get variants, assuming primary if debian/variants is not present variants = -- @@ -139,10 +139,10 @@ nvidia-%: $(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-440-$(src_abi)-$* - install -d debian/linux-modules-nvidia-440-$(src_abi)-$*/usr/lib/linux/triggers - $(call build_dkms, $(src_abi)-$*, linux-modules-nvidia-440-$(src_abi)-$*, $(CURDIR)/debian/linux-modules-nvidia-440-$(src_abi)-$*/lib/modules/$(src_abi)-$*/kernel, 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) - $(call install_control,linux-modules-nvidia-440-$(src_abi)-$*,$*,nvidia,440,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 + $(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) prepare-dkms: mkdir -p $(dkms_dir) @@ -157,11 +157,11 @@ 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-440-modules="nvidia-dkms-440 (= $(dkms_nvidia_440_version))" +gencontrol_flags += -Vdkms:nvidia-450-modules="nvidia-dkms-450 (= $(dkms_nvidia_450_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-440="nvidia-kernel-common-440 (<= $(nvidia_440_upstream_version)-1), nvidia-kernel-common-440 (>= $(nvidia_440_upstream_version))" +gencontrol_flags += -Vnvk:nvidia-450="nvidia-kernel-common-450 (<= $(nvidia_450_upstream_version)-1), nvidia-kernel-common-450 (>= $(nvidia_450_upstream_version))" override_dh_gencontrol: dh_gencontrol -- $(gencontrol_flags) From patchwork Tue Aug 25 15:47:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Milone X-Patchwork-Id: 1351144 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 4BbYLn13rmz9sTd; Wed, 26 Aug 2020 01:48:49 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1kAbBm-0002Bg-N2; Tue, 25 Aug 2020 15:48: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 1kAbBj-0002AR-GH for kernel-team@lists.ubuntu.com; Tue, 25 Aug 2020 15:48:43 +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 1kAbBj-0001f4-8Z for kernel-team@lists.ubuntu.com; Tue, 25 Aug 2020 15:48:43 +0000 Received: by mail-wm1-f72.google.com with SMTP id a5so885034wmj.5 for ; Tue, 25 Aug 2020 08:48:43 -0700 (PDT) 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=gLcpiHgBmVeSVxqAW1cS0q+mEzMJ7TtjIsBFI4hmypI=; b=BvmdvstTNxMfkL0qpSzhz5XfbTxusrog/dfzTar8eYZItBO/G3Xcffldo7k53Vk9qG AMZwyhQGQyKuygsXYspVznmfOV/6Om06pl++58X526Bs8BpwthPKOj5fyN5DvCiRFbtE /55+utCsp2tOzPqyEa9m2R2D4103d5CxHQrN5CMcbcdvZ5fPJF2vLqvBG+RXhuE15M6V Nd5RT+TRxAb0PzM0faClm/x/iUdHvUnq5xCeO6GG+w2BKIIIC6Bk1oMP/htaeG2i/5Fw XPpzVLuk6SpRdX3uTbI9UQ8O/pXX/JUeGTFTT1Lxhd2LIySP0cGQ8aS/pcZUgiMC3PnH SUGg== X-Gm-Message-State: AOAM531n0NjirjgvYDZEOrFGxX0/EzsvqS2qT1liUlk5YZGjaTXP3hrY 6fA0evutmqM7YTQNOFaCfbthhS410otYPIzcl+MmzrHk/IZjbSLbkC7KyjGm0cBWReT3wCpxPlg f+1Diln2TTHoouGH5cJT06QCh/AyAENqqKHmWuY0vPw== X-Received: by 2002:adf:eb89:: with SMTP id t9mr11046077wrn.65.1598370522493; Tue, 25 Aug 2020 08:48:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz96P0I5v7iiVNJGQ7JYIyW5ygp4zLvJtfx9FzFLHZ4tDLK7keKJaKyDcIvOmEX1fDOaU1M9g== X-Received: by 2002:adf:eb89:: with SMTP id t9mr11046064wrn.65.1598370522194; Tue, 25 Aug 2020 08:48:42 -0700 (PDT) Received: from thinkpad.lan (dynamic-adsl-94-34-39-30.clienti.tiscali.it. [94.34.39.30]) by smtp.gmail.com with ESMTPSA id h14sm7115715wml.30.2020.08.25.08.48.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 08:48:41 -0700 (PDT) From: Alberto Milone To: kernel-team@lists.ubuntu.com Subject: [PATCH 7/10 F][SRU] UBUNTU: [packaging] add signed modules for nvidia 450 and 450-server Date: Tue, 25 Aug 2020 17:47:53 +0200 Message-Id: <20200825154756.3753617-8-alberto.milone@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200825154756.3753617-1-alberto.milone@canonical.com> References: <20200825154756.3753617-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" While the 450 series replaces the 440 series, the 450-server series is only an addition to the 440-server series. BugLink: https://bugs.launchpad.net/bugs/1887674 Signed-off-by: Alberto Milone --- debian/dkms-versions | 3 ++- debian/rules | 3 ++- debian/rules.d/2-binary-arch.mk | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/debian/dkms-versions b/debian/dkms-versions index 143130d0d33d..89e3bba3f934 100644 --- a/debian/dkms-versions +++ b/debian/dkms-versions @@ -1,8 +1,9 @@ zfs-linux 0.8.3-1ubuntu12.1 nvidia-graphics-drivers-390 390.138-0ubuntu0.20.04.1 nvidia-graphics-drivers-435 435.21-0ubuntu7 -nvidia-graphics-drivers-440 440.100-0ubuntu0.20.04.1 +nvidia-graphics-drivers-450 0 nvidia-graphics-drivers-418-server 418.152.00-0ubuntu0.20.04.1 nvidia-graphics-drivers-440-server 440.95.01-0ubuntu0.20.04.1 +nvidia-graphics-drivers-450-server 0 virtualbox 6.1.6-dfsg-1 wireguard-linux-compat 1.0.20200506-1~20.04.1 diff --git a/debian/rules b/debian/rules index 60d9496fc0c3..4d79d4a22a52 100755 --- a/debian/rules +++ b/debian/rules @@ -127,9 +127,10 @@ do_any_tools=$(sort $(filter-out false,$(do_linux_tools) $(do_cloud_tools))) dkms_zfs_linux_version=$(shell gawk '/^zfs-linux / { 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) +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) dkms_vbox_guest_version=$(shell gawk '/^virtualbox/ { print $$2; }' debian/dkms-versions) dkms_wireguard_version=$(shell gawk '/^wireguard-linux-compat / { print $$2; }' debian/dkms-versions) diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 9dbb9d2e2fe4..7da3af02eb91 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -405,12 +405,14 @@ endif 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_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) + $(call build_dkms, $(bldinfo_pkg_name)-$*, $(pkgdir_bldinfo)/usr/lib/linux/$(abi_release)-$*/signatures, "", 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) endif ifeq ($(do_dkms_nvidia_server),true) $(call build_dkms, $(bldinfo_pkg_name)-$*, $(pkgdir_bldinfo)/usr/lib/linux/$(abi_release)-$*/signatures, "", nvidia-418srv, pool/restricted/n/nvidia-graphics-drivers-418-server/nvidia-kernel-source-418-server_$(dkms_nvidia_418_server_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-418-server/nvidia-dkms-418-server_$(dkms_nvidia_418_server_version)_$(arch).deb) $(call build_dkms, $(bldinfo_pkg_name)-$*, $(pkgdir_bldinfo)/usr/lib/linux/$(abi_release)-$*/signatures, "", nvidia-440srv, pool/restricted/n/nvidia-graphics-drivers-440-server/nvidia-kernel-source-440-server_$(dkms_nvidia_440_server_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-440-server/nvidia-dkms-440-server_$(dkms_nvidia_440_server_version)_$(arch).deb) + $(call build_dkms, $(bldinfo_pkg_name)-$*, $(pkgdir_bldinfo)/usr/lib/linux/$(abi_release)-$*/signatures, "", nvidia-450srv, pool/restricted/n/nvidia-graphics-drivers-450-server/nvidia-kernel-source-450-server_$(dkms_nvidia_450_server_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-450-server/nvidia-dkms-450-server_$(dkms_nvidia_450_server_version)_$(arch).deb) + endif ifeq ($(do_extras_package),true) From patchwork Tue Aug 25 15:47:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Milone X-Patchwork-Id: 1351145 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 4BbYLw0TV6z9sTN; Wed, 26 Aug 2020 01:48:56 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1kAbBs-0002Eo-Up; Tue, 25 Aug 2020 15:48:52 +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 1kAbBq-0002Db-2w for kernel-team@lists.ubuntu.com; Tue, 25 Aug 2020 15:48:50 +0000 Received: from mail-wm1-f70.google.com ([209.85.128.70]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kAbBp-0001fz-PY for kernel-team@lists.ubuntu.com; Tue, 25 Aug 2020 15:48:49 +0000 Received: by mail-wm1-f70.google.com with SMTP id f189so877820wmf.8 for ; Tue, 25 Aug 2020 08:48:49 -0700 (PDT) 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=45YhpHFNTJJTKOK0VzTeTy1EBIan1YjlOUCU8E1YzEU=; b=a+2/GhSzp1fNLKUH4tszBWPiXwOonigApSpKRA4V30FsTYC4GimucfmhaeHMkkm694 QwO5I+GKmUrMTfqZ/FfAnplJLDoS9M/QKu676rfWzSCuxiAiHvVbOhm2sEicxA5W9Ord uK3+PEHP3dstsxxXKn2BICNkce0BZhpvoDtW8f0wcbNZRteUpmupneWqD8hiJb0II54s TY8/kdUgg7XMTXqrryOv6rlZCKar0IY4vDfkPrJaRhBsasvEC867Nwafws0943SsQPl7 0o6ZZux3Olr1JaDZgDP6brcfiRqUxFWtHbH4EWUD83+jID0BLa32Z88HL09ndGfzRYja +RIA== X-Gm-Message-State: AOAM533gcgCFA3KkAmscJ1mMlOta7bXpaOVvNF5F4kK7n7GJzidFPhO4 irMabROl/CH3AZy8zcsqmX/banyMlONIvXd41YOjI34oMGowO00ahbjg98QiuI+Vjl46QTx1kJs 2ichsLb4lYp7jF/pIyFQmZyxhFvcbuRgG1X0SI1Jz7w== X-Received: by 2002:a5d:550e:: with SMTP id b14mr12012993wrv.392.1598370528732; Tue, 25 Aug 2020 08:48:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzDpBD7NqePDpf7EZ81SnHiaQW3s6e36idu1rWNgLkCApSm+eSJw91+BB7lJP58yVEV0OSCdg== X-Received: by 2002:a5d:550e:: with SMTP id b14mr12012950wrv.392.1598370528161; Tue, 25 Aug 2020 08:48:48 -0700 (PDT) Received: from thinkpad.lan (dynamic-adsl-94-34-39-30.clienti.tiscali.it. [94.34.39.30]) by smtp.gmail.com with ESMTPSA id h14sm7115715wml.30.2020.08.25.08.48.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 08:48:47 -0700 (PDT) From: Alberto Milone To: kernel-team@lists.ubuntu.com Subject: [PATCH 8/10 F][SRU][L-R-M] UBUNTU: [packaging] add nvidia 450 and 450-server drivers Date: Tue, 25 Aug 2020 17:47:54 +0200 Message-Id: <20200825154756.3753617-9-alberto.milone@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200825154756.3753617-1-alberto.milone@canonical.com> References: <20200825154756.3753617-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" While the 450 series replaces the 440 series (which we are adding transitional packages for), the 450-server series is only an addition to the 440-server series. BugLink: https://bugs.launchpad.net/bugs/1887674 Signed-off-by: Alberto Milone --- debian/control.d/meta-nvidia | 50 +++++++++++++++++------ debian/control.d/nvidia | 46 +++++++++++++++++++-- debian/control.d/transitionals-nvidia-440 | 13 ++++++ debian/rules | 25 ++++++++---- 4 files changed, 110 insertions(+), 24 deletions(-) create mode 100644 debian/control.d/transitionals-nvidia-440 diff --git a/debian/control.d/meta-nvidia b/debian/control.d/meta-nvidia index 35f38f5..3cb0f94 100644 --- a/debian/control.d/meta-nvidia +++ b/debian/control.d/meta-nvidia @@ -24,17 +24,17 @@ Description: Extra drivers for nvidia-435 for generic${variant:suffix} Install extra signed nvidia-435 modules compatible with generic${variant:suffix} -Package: linux-modules-nvidia-440-generic${variant:suffix} +Package: linux-modules-nvidia-450-generic${variant:suffix} Build-Profiles: Architecture: amd64 Section: kernel -Provides: ${dkms:nvidia-440-modules} +Provides: ${dkms:nvidia-450-modules} Depends: ${misc:Depends}, - linux-modules-nvidia-440-@ABI@-generic (= ${binary:Version}), - ${nvk:nvidia-440} -Description: Extra drivers for nvidia-440 for generic${variant:suffix} - Install extra signed nvidia-440 modules compatible with + linux-modules-nvidia-450-@ABI@-generic (= ${binary:Version}), + ${nvk:nvidia-450} +Description: Extra drivers for nvidia-450 for generic${variant:suffix} + Install extra signed nvidia-450 modules compatible with generic${variant:suffix} Package: linux-modules-nvidia-418-server-generic${variant:suffix} @@ -63,6 +63,19 @@ Description: Extra drivers for nvidia-440-server for generic${variant:suffix} Install extra signed nvidia-440-server modules compatible with generic${variant:suffix} +Package: linux-modules-nvidia-450-server-generic${variant:suffix} +Build-Profiles: +Architecture: amd64 +Section: kernel +Provides: ${dkms:nvidia-450-server-modules} +Depends: + ${misc:Depends}, + linux-modules-nvidia-450-server-@ABI@-generic (= ${binary:Version}), + ${nvk:nvidia-450-server} +Description: Extra drivers for nvidia-450-server for generic${variant:suffix} + Install extra signed nvidia-450-server modules compatible with + generic${variant:suffix} + Package: linux-modules-nvidia-390-lowlatency${variant:suffix} Build-Profiles: Architecture: amd64 @@ -89,17 +102,17 @@ Description: Extra drivers for nvidia-435 for lowlatency${variant:suffix} Install extra signed nvidia-435 modules compatible with lowlatency${variant:suffix} -Package: linux-modules-nvidia-440-lowlatency${variant:suffix} +Package: linux-modules-nvidia-450-lowlatency${variant:suffix} Build-Profiles: Architecture: amd64 Section: kernel -Provides: ${dkms:nvidia-440-modules} +Provides: ${dkms:nvidia-450-modules} Depends: ${misc:Depends}, - linux-modules-nvidia-440-@ABI@-lowlatency (= ${binary:Version}), - ${nvk:nvidia-440} -Description: Extra drivers for nvidia-440 for lowlatency${variant:suffix} - Install extra signed nvidia-440 modules compatible with + linux-modules-nvidia-450-@ABI@-lowlatency (= ${binary:Version}), + ${nvk:nvidia-450} +Description: Extra drivers for nvidia-450 for lowlatency${variant:suffix} + Install extra signed nvidia-450 modules compatible with lowlatency${variant:suffix} Package: linux-modules-nvidia-418-server-lowlatency${variant:suffix} @@ -127,3 +140,16 @@ Depends: Description: Extra drivers for nvidia-440-server for lowlatency${variant:suffix} Install extra signed nvidia-440-server modules compatible with lowlatency${variant:suffix} + +Package: linux-modules-nvidia-450-server-lowlatency${variant:suffix} +Build-Profiles: +Architecture: amd64 +Section: kernel +Provides: ${dkms:nvidia-450-server-modules} +Depends: + ${misc:Depends}, + linux-modules-nvidia-450-server-@ABI@-lowlatency (= ${binary:Version}), + ${nvk:nvidia-450-server} +Description: Extra drivers for nvidia-450-server for lowlatency${variant:suffix} + Install extra signed nvidia-450-server modules compatible with + lowlatency${variant:suffix} diff --git a/debian/control.d/nvidia b/debian/control.d/nvidia index c2a012d..383c55d 100644 --- a/debian/control.d/nvidia +++ b/debian/control.d/nvidia @@ -36,7 +36,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-440-@ABI@-generic +Package: linux-modules-nvidia-450-@ABI@-generic Build-Profiles: Architecture: amd64 Section: kernel @@ -51,7 +51,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-440-generic* meta-packages, + one of the linux-modules-nvidia-450-generic* meta-packages, which will ensure that upgrades work correctly, and that supporting packages are also installed. @@ -93,6 +93,25 @@ 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-450-server-@ABI@-generic +Build-Profiles: +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, +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-450-server-generic* meta-packages, + which will ensure that upgrades work correctly, and that supporting packages are + also installed. + Package: linux-modules-nvidia-390-@ABI@-lowlatency Build-Profiles: Architecture: amd64 @@ -131,7 +150,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-440-@ABI@-lowlatency +Package: linux-modules-nvidia-450-@ABI@-lowlatency Build-Profiles: Architecture: amd64 Section: kernel @@ -146,7 +165,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-440-lowlatency* meta-packages, + one of the linux-modules-nvidia-450-lowlatency* meta-packages, which will ensure that upgrades work correctly, and that supporting packages are also installed. @@ -187,3 +206,22 @@ Description: Linux kernel nvidia modules for version @ABI@ one of the linux-modules-nvidia-440-server-lowlatency* meta-packages, which will ensure that upgrades work correctly, and that supporting packages are also installed. + +Package: linux-modules-nvidia-450-server-@ABI@-lowlatency +Build-Profiles: +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, +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-450-server-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-440 b/debian/control.d/transitionals-nvidia-440 new file mode 100644 index 0000000..987ecad --- /dev/null +++ b/debian/control.d/transitionals-nvidia-440 @@ -0,0 +1,13 @@ +Package: linux-modules-nvidia-440-generic +Architecture: amd64 +Section: oldlibs +Depends: linux-modules-nvidia-450-generic +Description: Extra drivers for nvidia-440 for the generic flavour (dummy transitional package) + Transitional package for upgrades of -440 to -450. + +Package: linux-modules-nvidia-440-lowlatency +Architecture: amd64 +Section: oldlibs +Depends: linux-modules-nvidia-450-lowlatency +Description: Extra drivers for nvidia-440 for the generic flavour (dummy transitional package) + Transitional package for upgrades of -440 to -450. diff --git a/debian/rules b/debian/rules index 3940bbf..91dcab6 100755 --- a/debian/rules +++ b/debian/rules @@ -15,15 +15,17 @@ 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_440_version=$(shell gawk '/^nvidia-graphics-drivers-440 / { 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_440_upstream_version=$(shell echo "$(dkms_nvidia_440_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) +nvidia_450_server_upstream_version=$(shell echo "$(dkms_nvidia_450_server_version)" | cut -d '-' -f 1) # Get variants, assuming primary if debian/variants is not present variants = -- @@ -143,10 +145,10 @@ nvidia-%: $(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-440-$(src_abi)-$* - install -d debian/linux-modules-nvidia-440-$(src_abi)-$*/usr/lib/linux/triggers - $(call build_dkms, $(src_abi)-$*, linux-modules-nvidia-440-$(src_abi)-$*, $(CURDIR)/debian/linux-modules-nvidia-440-$(src_abi)-$*/lib/modules/$(src_abi)-$*/kernel, "", 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) - $(call install_control,linux-modules-nvidia-440-$(src_abi)-$*,$*,nvidia,440,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 + $(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) install -d debian/linux-modules-nvidia-418-server-$(src_abi)-$* install -d debian/linux-modules-nvidia-418-server-$(src_abi)-$*/usr/lib/linux/triggers @@ -158,6 +160,11 @@ nvidia-%: $(call build_dkms, $(src_abi)-$*, linux-modules-nvidia-440-server-$(src_abi)-$*, $(CURDIR)/debian/linux-modules-nvidia-440-server-$(src_abi)-$*/lib/modules/$(src_abi)-$*/kernel, "", nvidia-440srv, pool/restricted/n/nvidia-graphics-drivers-440-server/nvidia-kernel-source-440-server_$(dkms_nvidia_440_server_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-440-server/nvidia-dkms-440-server_$(dkms_nvidia_440_server_version)_$(arch).deb) $(call install_control,linux-modules-nvidia-440-server-$(src_abi)-$*,$*,nvidia,440srv,postinst postrm prerm config templates) + install -d debian/linux-modules-nvidia-450-server-$(src_abi)-$* + install -d debian/linux-modules-nvidia-450-server-$(src_abi)-$*/usr/lib/linux/triggers + $(call build_dkms, $(src_abi)-$*, linux-modules-nvidia-450-server-$(src_abi)-$*, $(CURDIR)/debian/linux-modules-nvidia-450-server-$(src_abi)-$*/lib/modules/$(src_abi)-$*/kernel, "", nvidia-450srv, pool/restricted/n/nvidia-graphics-drivers-450-server/nvidia-kernel-source-450-server_$(dkms_nvidia_450_server_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-450-server/nvidia-dkms-450-server_$(dkms_nvidia_450_server_version)_$(arch).deb) + $(call install_control,linux-modules-nvidia-450-server-$(src_abi)-$*,$*,nvidia,450srv,postinst postrm prerm config templates) + prepare-dkms: mkdir -p $(dkms_dir) ln -s /usr/src $(dkms_dir)/headers @@ -171,15 +178,17 @@ 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-440-modules="nvidia-dkms-440 (= $(dkms_nvidia_440_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-440="nvidia-kernel-common-440 (<= $(nvidia_440_upstream_version)-1), nvidia-kernel-common-440 (>= $(nvidia_440_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))" +gencontrol_flags += -Vnvk:nvidia-450-server="nvidia-kernel-common-450-server (<= $(nvidia_450_server_upstream_version)-1), nvidia-kernel-common-450-server (>= $(nvidia_450_server_upstream_version))" override_dh_gencontrol: dh_gencontrol -- $(gencontrol_flags) From patchwork Tue Aug 25 15:47:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Milone X-Patchwork-Id: 1351146 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 4BbYLy2GPmz9sTg; Wed, 26 Aug 2020 01:48:58 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1kAbBv-0002HA-GQ; Tue, 25 Aug 2020 15:48:55 +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 1kAbBu-0002Fq-1J for kernel-team@lists.ubuntu.com; Tue, 25 Aug 2020 15:48:54 +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 1kAbBt-0001gP-Pj for kernel-team@lists.ubuntu.com; Tue, 25 Aug 2020 15:48:53 +0000 Received: by mail-wm1-f69.google.com with SMTP id p184so1082444wmp.7 for ; Tue, 25 Aug 2020 08:48:53 -0700 (PDT) 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=BmIs30v9RKcnuyOIL3iNos8wRqtk2oBsDkflXGAFCPM=; b=US9tPVqs0qClQE2jrYVq9Pj+hvXZs+XdyPcYsJl1xNrVmMEdWchcQttSmulfUo7XoS Flz4fpIZhflhd/7mRtJX+kmjTiQb2SMMe5ZaODLfG74rW1PDakMKQw4rEhO0u5QRnYw2 fHER589y5VcfBI/Jx2gY2ymudI7VLbJkMdN0g4Jz1sWtYd8SLBV8gxAkrTJmMhjMg/oN tQrcdBs2GXd7IhRDgLbhO5azGo3PNR13joElazR0AjWI9PJx7/4pqjSbh3ysLvNDVVRf rEeW4/xFABm6hdngqny+331e/R4gDiMXvwVksSSTDVD5/w5IDbbsRtkHJDvERXQCl1Jc rxaw== X-Gm-Message-State: AOAM531LSZT/mSqCxuREA/08Q868Ea0YRLTtDSB5MGRfyjHBNj7iQY2J 6IH0jaj7q4VTYuIvmtldfz8j5naPz/UYQsWjbvTr177eG2Zht4hh3CZUptqLNj6PFZgtkgZLcAI H+u1sTundEBGD6wNUj82zIC+YpaEUzB1PffFCF+pf6Q== X-Received: by 2002:a1c:7502:: with SMTP id o2mr2567748wmc.29.1598370533080; Tue, 25 Aug 2020 08:48:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyNA8RJoIlannYXoDzyNGi3eWsy3CjnxlZptqHJynGOeX25tPdiQZfmOLXzKhshzkttASVclQ== X-Received: by 2002:a1c:7502:: with SMTP id o2mr2567727wmc.29.1598370532710; Tue, 25 Aug 2020 08:48:52 -0700 (PDT) Received: from thinkpad.lan (dynamic-adsl-94-34-39-30.clienti.tiscali.it. [94.34.39.30]) by smtp.gmail.com with ESMTPSA id h14sm7115715wml.30.2020.08.25.08.48.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 08:48:52 -0700 (PDT) From: Alberto Milone To: kernel-team@lists.ubuntu.com Subject: [PATCH 9/10 F][SRU][OEM-5.6] UBUNTU: [packaging] add signed modules for the 450 nvidia driver Date: Tue, 25 Aug 2020 17:47:55 +0200 Message-Id: <20200825154756.3753617-10-alberto.milone@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200825154756.3753617-1-alberto.milone@canonical.com> References: <20200825154756.3753617-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" The 450 series replaces the 440 series. BugLink: https://bugs.launchpad.net/bugs/1887674 Signed-off-by: Alberto Milone --- debian/dkms-versions | 2 +- debian/rules | 2 +- debian/rules.d/2-binary-arch.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/dkms-versions b/debian/dkms-versions index 05cf9f251596..289e1704b993 100644 --- a/debian/dkms-versions +++ b/debian/dkms-versions @@ -1,3 +1,3 @@ zfs-linux 0.8.3-1ubuntu12 -nvidia-graphics-drivers-440 440.100-0ubuntu0.20.04.1 +nvidia-graphics-drivers-450 0 virtualbox 6.1.6-dfsg-1 diff --git a/debian/rules b/debian/rules index 720cb65c6867..130546fc2cee 100755 --- a/debian/rules +++ b/debian/rules @@ -120,7 +120,7 @@ do_any_tools=$(sort $(filter-out false,$(do_linux_tools) $(do_cloud_tools))) # Versions of dkms packages. dkms_zfs_linux_version=$(shell gawk '/^zfs-linux / { print $$2; }' debian/dkms-versions) -dkms_nvidia_440_version=$(shell gawk '/^nvidia-graphics-drivers-440/ { print $$2; }' debian/dkms-versions) +dkms_nvidia_450_version=$(shell gawk '/^nvidia-graphics-drivers-450/ { print $$2; }' debian/dkms-versions) dkms_vbox_guest_version=$(shell gawk '/^virtualbox/ { print $$2; }' debian/dkms-versions) # Debian Build System targets diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 1b4715f442d5..f2e01816ae09 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -401,7 +401,7 @@ endif $(if $(filter true,$(enable_zfs)),$(call build_dkms, $(mods_pkg_name)-$*, $(pkgdir)/lib/modules/$(abi_release)-$*/kernel, $(dbgpkgdir_zfs), 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-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) + $(call build_dkms, $(bldinfo_pkg_name)-$*, $(pkgdir_bldinfo)/usr/lib/linux/$(abi_release)-$*/signatures, "", 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) endif ifeq ($(do_extras_package),true) From patchwork Tue Aug 25 15:47:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Milone X-Patchwork-Id: 1351147 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 4BbYM25lHHz9sTh; Wed, 26 Aug 2020 01:49:02 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1kAbBz-0002Kc-Nq; Tue, 25 Aug 2020 15:48:59 +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 1kAbBy-0002JB-0K for kernel-team@lists.ubuntu.com; Tue, 25 Aug 2020 15:48:58 +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 1kAbBx-0001gl-OE for kernel-team@lists.ubuntu.com; Tue, 25 Aug 2020 15:48:57 +0000 Received: by mail-wm1-f72.google.com with SMTP id z1so876916wmf.9 for ; Tue, 25 Aug 2020 08:48:57 -0700 (PDT) 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=oqeGMwS6mX5AlS8VmAHCForKoxk1MmgLsgMgNIFpQog=; b=nkmhtEMKfMZSvl+oTKPPbbDjMuOucPFUSoBUfzbP6u1+ozyFiT8Yd4KFbLcHspJIvU fEhHZkg3hZhlzZHyzgqaxlNizcA2vW1IQyV6JXqW1HbrPLNkALnmbPmoFT7HLAcekmwD bs4QfnOljJ3MrUlNyIw+H90X1yut1AY3BwG47UVWtwo+fDuBlOsNFXUpClpBEv5zra/R Xr64WmAvTR9ZJ5jfp7VHK8X/9pmga0aGaf0+BZsqXmMkAD5XSh1mEamKFdOycDk3x5kO j5BryB+3WOcb1gbtircTGYzWtHpzkp97hbaH2efh+MlvewFMUbgLxv1z8ZOpd68qwnBg ccvQ== X-Gm-Message-State: AOAM532BwL7Bct9tvvqbUYTQWNWDGHfcN9Z0a1jFTa0gOhV6BKi7hi6+ 2HO1nI7wRTUZIW24OKOJ7Ql77a5+fZ1Vx521CNF1TNDGZNOSHaGB5N/TgjRwvYJBHDeYCrdupMo GJl41ydL8B4G+VSBjvsjfSb/lS0B2pfZiL1TYwPWbNg== X-Received: by 2002:a7b:cf0b:: with SMTP id l11mr2592129wmg.128.1598370536906; Tue, 25 Aug 2020 08:48:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJysg/IJCAjhKgX/+6k8rAw7BWZzh5eijOhhvpOTvTdTmNFRR33g8EKoQtWZVBqL02W1oJgruA== X-Received: by 2002:a7b:cf0b:: with SMTP id l11mr2592107wmg.128.1598370536571; Tue, 25 Aug 2020 08:48:56 -0700 (PDT) Received: from thinkpad.lan (dynamic-adsl-94-34-39-30.clienti.tiscali.it. [94.34.39.30]) by smtp.gmail.com with ESMTPSA id h14sm7115715wml.30.2020.08.25.08.48.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 08:48:55 -0700 (PDT) From: Alberto Milone To: kernel-team@lists.ubuntu.com Subject: [PATCH 10/10 F][SRU][OEM-5.6][L-R-M] UBUNTU: [packaging] replace nvidia 440 with nvidia 450 driver Date: Tue, 25 Aug 2020 17:47:56 +0200 Message-Id: <20200825154756.3753617-11-alberto.milone@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200825154756.3753617-1-alberto.milone@canonical.com> References: <20200825154756.3753617-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" The 450 series replaces the 440 series, which we are adding transitional packages for. BugLink: https://bugs.launchpad.net/bugs/1887674 Signed-off-by: Alberto Milone --- debian/control.d/meta-nvidia | 12 ++++++------ debian/control.d/nvidia | 2 +- debian/control.d/transitionals-nvidia-440 | 6 ++++++ debian/dkms-versions | 2 +- debian/rules | 16 ++++++++-------- 5 files changed, 22 insertions(+), 16 deletions(-) create mode 100644 debian/control.d/transitionals-nvidia-440 diff --git a/debian/control.d/meta-nvidia b/debian/control.d/meta-nvidia index b8e1d72..b5115bf 100644 --- a/debian/control.d/meta-nvidia +++ b/debian/control.d/meta-nvidia @@ -1,9 +1,9 @@ -Package: linux-modules-nvidia-440${variant:suffix} +Package: linux-modules-nvidia-450${variant:suffix} Build-Profiles: Architecture: amd64 Section: kernel -Provides: ${dkms:nvidia-440-modules} -Depends: ${misc:Depends}, linux-modules-nvidia-440-ABI-oem (= ${binary:Version}), - ${nvk:nvidia-440} -Description: Extra drivers for nvidia-440 for the OEM flavour - Install extra signed nvidia-440 modules compatible with the OEM flavour. +Provides: ${dkms:nvidia-450-modules} +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. diff --git a/debian/control.d/nvidia b/debian/control.d/nvidia index f774f52..b0dd828 100644 --- a/debian/control.d/nvidia +++ b/debian/control.d/nvidia @@ -1,4 +1,4 @@ -Package: linux-modules-nvidia-440-ABI-oem +Package: linux-modules-nvidia-450-ABI-oem Build-Profiles: Architecture: amd64 Section: kernel diff --git a/debian/control.d/transitionals-nvidia-440 b/debian/control.d/transitionals-nvidia-440 new file mode 100644 index 0000000..982a2ee --- /dev/null +++ b/debian/control.d/transitionals-nvidia-440 @@ -0,0 +1,6 @@ +Package: linux-modules-nvidia-440-oem +Architecture: amd64 +Section: oldlibs +Depends: linux-modules-nvidia-450-oem +Description: Extra drivers for nvidia-440 for the oem flavour (dummy transitional package) + Transitional package for upgrades of -440 to -450. diff --git a/debian/dkms-versions b/debian/dkms-versions index 05cf9f2..289e170 100644 --- a/debian/dkms-versions +++ b/debian/dkms-versions @@ -1,3 +1,3 @@ zfs-linux 0.8.3-1ubuntu12 -nvidia-graphics-drivers-440 440.100-0ubuntu0.20.04.1 +nvidia-graphics-drivers-450 0 virtualbox 6.1.6-dfsg-1 diff --git a/debian/rules b/debian/rules index 5d7c195..5fe08ba 100755 --- a/debian/rules +++ b/debian/rules @@ -16,9 +16,9 @@ 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_440_version=$(shell gawk '/^nvidia-graphics-drivers-440 / { print $$2; }' debian/dkms-versions) +dkms_nvidia_450_version=$(shell gawk '/^nvidia-graphics-drivers-450 / { print $$2; }' debian/dkms-versions) -nvidia_440_upstream_version=$(shell echo "$(dkms_nvidia_440_version)" | cut -d '-' -f 1) +nvidia_450_upstream_version=$(shell echo "$(dkms_nvidia_450_version)" | cut -d '-' -f 1) # Get variants, assumng primary if debian/variants is not present variants = -- @@ -125,10 +125,10 @@ flavours=$(patsubst /usr/lib/linux/$(src_abi)-%,nvidia-%,$(signatures)) nvidia-%: rm -rf $(dkms_dir)/build $(dkms_dir)/source mkdir -p $(dkms_dir)/build $(dkms_dir)/source - install -d debian/linux-modules-nvidia-440-$(src_abi)-$* - install -d debian/linux-modules-nvidia-440-$(src_abi)-$*/usr/lib/linux/triggers - $(call build_dkms, $(src_abi)-$*, linux-modules-nvidia-440-$(src_abi)-$*, $(CURDIR)/debian/linux-modules-nvidia-440-$(src_abi)-$*/lib/modules/$(src_abi)-$*/kernel, "", 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) - $(call install_control,linux-modules-nvidia-440-$(src_abi)-$*,$*,nvidia,440,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 + $(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) prepare-dkms: mkdir -p $(dkms_dir) @@ -137,9 +137,9 @@ prepare-dkms: override_dh_auto_install: prepare-dkms $(flavours) dh_install -gencontrol_flags += -Vdkms:nvidia-440-modules="nvidia-dkms-440 (= $(dkms_nvidia_440_version))" +gencontrol_flags += -Vdkms:nvidia-450-modules="nvidia-dkms-450 (= $(dkms_nvidia_450_version))" -gencontrol_flags += -Vnvk:nvidia-440="nvidia-kernel-common-440 (<= $(nvidia_440_upstream_version)-1), nvidia-kernel-common-440 (>= $(nvidia_440_upstream_version))" +gencontrol_flags += -Vnvk:nvidia-450="nvidia-kernel-common-450 (<= $(nvidia_450_upstream_version)-1), nvidia-kernel-common-450 (>= $(nvidia_450_upstream_version))" override_dh_gencontrol: dh_gencontrol -- $(gencontrol_flags)