From patchwork Thu Nov 5 16:41:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Pisati X-Patchwork-Id: 1395124 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 4CRq6z3jScz9sRK; Fri, 6 Nov 2020 03:42:03 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1kaiKj-0002MM-Cd; Thu, 05 Nov 2020 16:41:57 +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 1kaiKh-0002Lb-ED for kernel-team@lists.ubuntu.com; Thu, 05 Nov 2020 16:41:55 +0000 Received: from 1.general.ppisati.uk.vpn ([10.172.193.134] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kaiKh-0004Ud-5h for kernel-team@lists.ubuntu.com; Thu, 05 Nov 2020 16:41:55 +0000 From: Paolo Pisati To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/2] UBUNTU: [Packaging] NVIDIA -- provide the nvidia-prebuilt-kernel virtual package Date: Thu, 5 Nov 2020 17:41:53 +0100 Message-Id: <20201105164154.108364-2-paolo.pisati@canonical.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201105164154.108364-1-paolo.pisati@canonical.com> References: <20201105164154.108364-1-paolo.pisati@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" From: Alberto Milone Make all the NVIDIA drivers, except for 390, provide the nvidia-prebuilt-kernel virtual package. This allows adding a generic dependency on the signed modules. BugLink: https://bugs.launchpad.net/bugs/1902093 Signed-off-by: Alberto Milone Signed-off-by: Paolo Pisati --- debian/control.d/meta-nvidia | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control.d/meta-nvidia b/debian/control.d/meta-nvidia index d7e7b72..af1f781 100644 --- a/debian/control.d/meta-nvidia +++ b/debian/control.d/meta-nvidia @@ -15,7 +15,7 @@ Package: linux-modules-nvidia-435-oracle${variant:suffix} Build-Profiles: Architecture: amd64 Section: kernel -Provides: ${dkms:nvidia-435-modules} +Provides: ${dkms:nvidia-435-modules}, nvidia-prebuilt-kernel Depends: ${misc:Depends}, linux-modules-nvidia-435-@ABI@-oracle (= ${binary:Version}), @@ -28,7 +28,7 @@ Package: linux-modules-nvidia-450-oracle${variant:suffix} Build-Profiles: Architecture: amd64 Section: kernel -Provides: ${dkms:nvidia-450-modules} +Provides: ${dkms:nvidia-450-modules}, nvidia-prebuilt-kernel Depends: ${misc:Depends}, linux-modules-nvidia-450-@ABI@-oracle (= ${binary:Version}), From patchwork Thu Nov 5 16:41:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Pisati X-Patchwork-Id: 1395123 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 4CRq6y6f9yz9s0b; Fri, 6 Nov 2020 03:42:02 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1kaiKk-0002NC-JS; Thu, 05 Nov 2020 16:41:58 +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 1kaiKh-0002Lh-UU for kernel-team@lists.ubuntu.com; Thu, 05 Nov 2020 16:41:55 +0000 Received: from 1.general.ppisati.uk.vpn ([10.172.193.134] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kaiKh-0004Uh-Lo for kernel-team@lists.ubuntu.com; Thu, 05 Nov 2020 16:41:55 +0000 From: Paolo Pisati To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/2] UBUNTU: [Packaging] NVIDIA -- Add the 455 driver Date: Thu, 5 Nov 2020 17:41:54 +0100 Message-Id: <20201105164154.108364-3-paolo.pisati@canonical.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201105164154.108364-1-paolo.pisati@canonical.com> References: <20201105164154.108364-1-paolo.pisati@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" From: Alberto Milone Add the 455 series, and drop the 435 series. BugLink: https://bugs.launchpad.net/bugs/1902093 Signed-off-by: Alberto Milone Signed-off-by: Paolo Pisati --- debian/control.d/meta-nvidia | 12 ++++++------ debian/control.d/migrate-nvidia-435 | 6 ++++++ debian/control.d/nvidia | 4 ++-- debian/rules | 16 ++++++++-------- 4 files changed, 22 insertions(+), 16 deletions(-) create mode 100644 debian/control.d/migrate-nvidia-435 diff --git a/debian/control.d/meta-nvidia b/debian/control.d/meta-nvidia index af1f781..4367c72 100644 --- a/debian/control.d/meta-nvidia +++ b/debian/control.d/meta-nvidia @@ -11,17 +11,17 @@ Description: Extra drivers for nvidia-390 for oracle${variant:suffix} Install extra signed nvidia-390 modules compatible with oracle${variant:suffix} -Package: linux-modules-nvidia-435-oracle${variant:suffix} +Package: linux-modules-nvidia-455-oracle${variant:suffix} Build-Profiles: Architecture: amd64 Section: kernel -Provides: ${dkms:nvidia-435-modules}, nvidia-prebuilt-kernel +Provides: ${dkms:nvidia-455-modules}, nvidia-prebuilt-kernel Depends: ${misc:Depends}, - linux-modules-nvidia-435-@ABI@-oracle (= ${binary:Version}), - ${nvk:nvidia-435} -Description: Extra drivers for nvidia-435 for oracle${variant:suffix} - Install extra signed nvidia-435 modules compatible with + linux-modules-nvidia-455-@ABI@-oracle (= ${binary:Version}), + ${nvk:nvidia-455} +Description: Extra drivers for nvidia-455 for oracle${variant:suffix} + Install extra signed nvidia-455 modules compatible with oracle${variant:suffix} Package: linux-modules-nvidia-450-oracle${variant:suffix} diff --git a/debian/control.d/migrate-nvidia-435 b/debian/control.d/migrate-nvidia-435 new file mode 100644 index 0000000..786f314 --- /dev/null +++ b/debian/control.d/migrate-nvidia-435 @@ -0,0 +1,6 @@ +Package: linux-modules-nvidia-435-oracle +Architecture: amd64 +Section: oldlibs +Depends: linux-modules-nvidia-455-oracle +Description: Extra drivers for nvidia-435 for the oracle flavour (dummy transitional package) + Transitional package for upgrades of -435 to -455. diff --git a/debian/control.d/nvidia b/debian/control.d/nvidia index 93904df..6906891 100644 --- a/debian/control.d/nvidia +++ b/debian/control.d/nvidia @@ -17,7 +17,7 @@ Description: Linux kernel nvidia modules for version @ABI@ which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-modules-nvidia-435-@ABI@-oracle +Package: linux-modules-nvidia-455-@ABI@-oracle Build-Profiles: Architecture: amd64 Section: kernel @@ -32,7 +32,7 @@ Description: Linux kernel nvidia modules for version @ABI@ This package contains the Linux kernel nvidia modules for version @ABI@. . You likely do not want to install this package directly. Instead, install the - one of the linux-modules-nvidia-435-oracle* meta-packages, + one of the linux-modules-nvidia-455-oracle* meta-packages, which will ensure that upgrades work correctly, and that supporting packages are also installed. diff --git a/debian/rules b/debian/rules index c91e509..e381b9f 100755 --- a/debian/rules +++ b/debian/rules @@ -14,11 +14,11 @@ src_series = $(shell dpkg-parsechangelog -SDistribution | sed -e 's/-\(security\ src_kernel = $(shell echo "$(src_package)" | sed -e 's/restricted-modules-//') dkms_nvidia_390_version=$(shell gawk '/^nvidia-graphics-drivers-390 / { print $$2; }' debian/dkms-versions) -dkms_nvidia_435_version=$(shell gawk '/^nvidia-graphics-drivers-435 / { print $$2; }' debian/dkms-versions) +dkms_nvidia_455_version=$(shell gawk '/^nvidia-graphics-drivers-455 / { print $$2; }' debian/dkms-versions) dkms_nvidia_450_version=$(shell gawk '/^nvidia-graphics-drivers-450 / { print $$2; }' debian/dkms-versions) nvidia_390_upstream_version=$(shell echo "$(dkms_nvidia_390_version)" | cut -d '-' -f 1) -nvidia_435_upstream_version=$(shell echo "$(dkms_nvidia_435_version)" | cut -d '-' -f 1) +nvidia_455_upstream_version=$(shell echo "$(dkms_nvidia_455_version)" | cut -d '-' -f 1) nvidia_450_upstream_version=$(shell echo "$(dkms_nvidia_450_version)" | cut -d '-' -f 1) # Get variants, assuming primary if debian/variants is not present @@ -134,10 +134,10 @@ nvidia-%: $(call build_dkms, $(src_abi)-$*, linux-modules-nvidia-390-$(src_abi)-$*, $(CURDIR)/debian/linux-modules-nvidia-390-$(src_abi)-$*/lib/modules/$(src_abi)-$*/kernel, "", nvidia-390, pool/restricted/n/nvidia-graphics-drivers-390/nvidia-kernel-source-390_$(dkms_nvidia_390_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-390/nvidia-dkms-390_$(dkms_nvidia_390_version)_$(arch).deb) $(call install_control,linux-modules-nvidia-390-$(src_abi)-$*,$*,nvidia,390,postinst postrm prerm config templates) - install -d debian/linux-modules-nvidia-435-$(src_abi)-$* - install -d debian/linux-modules-nvidia-435-$(src_abi)-$*/usr/lib/linux/triggers - $(call build_dkms, $(src_abi)-$*, linux-modules-nvidia-435-$(src_abi)-$*, $(CURDIR)/debian/linux-modules-nvidia-435-$(src_abi)-$*/lib/modules/$(src_abi)-$*/kernel, "", nvidia-435, pool/restricted/n/nvidia-graphics-drivers-435/nvidia-kernel-source-435_$(dkms_nvidia_435_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-435/nvidia-dkms-435_$(dkms_nvidia_435_version)_$(arch).deb) - $(call install_control,linux-modules-nvidia-435-$(src_abi)-$*,$*,nvidia,435,postinst postrm prerm config templates) + install -d debian/linux-modules-nvidia-455-$(src_abi)-$* + install -d debian/linux-modules-nvidia-455-$(src_abi)-$*/usr/lib/linux/triggers + $(call build_dkms, $(src_abi)-$*, linux-modules-nvidia-455-$(src_abi)-$*, $(CURDIR)/debian/linux-modules-nvidia-455-$(src_abi)-$*/lib/modules/$(src_abi)-$*/kernel, "", nvidia-455, pool/restricted/n/nvidia-graphics-drivers-455/nvidia-kernel-source-455_$(dkms_nvidia_455_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-455/nvidia-dkms-455_$(dkms_nvidia_455_version)_$(arch).deb) + $(call install_control,linux-modules-nvidia-455-$(src_abi)-$*,$*,nvidia,455,postinst postrm prerm config templates) install -d debian/linux-modules-nvidia-450-$(src_abi)-$* install -d debian/linux-modules-nvidia-450-$(src_abi)-$*/usr/lib/linux/triggers @@ -156,11 +156,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-455-modules="nvidia-dkms-455 (= $(dkms_nvidia_455_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-455="nvidia-kernel-common-455 (<= $(nvidia_455_upstream_version)-1), nvidia-kernel-common-455 (>= $(nvidia_455_upstream_version))" gencontrol_flags += -Vnvk:nvidia-450="nvidia-kernel-common-450 (<= $(nvidia_450_upstream_version)-1), nvidia-kernel-common-450 (>= $(nvidia_450_upstream_version))" override_dh_gencontrol: