From patchwork Wed Nov 4 16:35: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: 1394262 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 4CRC2f2MNHz9sRR; Thu, 5 Nov 2020 03:36:10 +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 1kaLlX-0005bb-AK; Wed, 04 Nov 2020 16:36:07 +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 1kaLlV-0005b5-4v for kernel-team@lists.ubuntu.com; Wed, 04 Nov 2020 16:36:05 +0000 Received: from mail-wr1-f70.google.com ([209.85.221.70]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kaLlU-0007LY-Tq for kernel-team@lists.ubuntu.com; Wed, 04 Nov 2020 16:36:04 +0000 Received: by mail-wr1-f70.google.com with SMTP id b6so9406483wrn.17 for ; Wed, 04 Nov 2020 08:36:04 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yM2cRpEKH9b1rlfDkeTVeDz6H0gATdCL9VBVHo8ZudU=; b=ahBeEDpe6RRLUieBUu1FTteXQeCDTwgQHJodKpeZcqX2OSh+oor4zbpy0jgxuE3/iB BoNTof6yWRkuIBVdbHwreGHZJg0rlMAX8HiKGxKwj4PVTwd8KtfI+A3PN6Lh04Jz+McO 6DnCcHxcFtgMNepMg+xdKMcGj4W8xfBQQ7w7VlSwgbbkCAfAiXcBkBxWI+fKR2JtCxWM RV/XBv9NtLSk2y7peLCioqvFtSKM99/+nMq+wOWLRV0P5m3rsxK2QHyp3ctgmHBn3onQ T4pYCFMpLTLVBphdCKky1Q7BTqs+/d6YcVBwV3HF8H7nlvC1pHYqrT4kF2FbkN4HRIhc hJIQ== X-Gm-Message-State: AOAM531mbg+9SucZPZGlWYbdfrJJepK0GA61+Dt6kxOkCz4pRxhYuZX0 iNIB3H+ikH4bws4dN5qeVVnuW1jEH68sIX0lidgn7gdYrJq3WS+kY7/MZlTMELVKHYN8Rq0oFeK zDY405cNX48+OKncfkEYawrlLKWP+3qzx1Z53T1i0pw== X-Received: by 2002:a1c:96cb:: with SMTP id y194mr5335062wmd.62.1604507764332; Wed, 04 Nov 2020 08:36:04 -0800 (PST) X-Google-Smtp-Source: ABdhPJwCo2mgzun703ShAcR2hHBBOv8Fn7h+vQ1ZhUS5I9lggWsSvSCo7i8THr06Ykp+6v3ThLLu5A== X-Received: by 2002:a1c:96cb:: with SMTP id y194mr5335045wmd.62.1604507764139; Wed, 04 Nov 2020 08:36:04 -0800 (PST) Received: from thinkpad.lan (dynamic-adsl-94-34-39-30.clienti.tiscali.it. [94.34.39.30]) by smtp.gmail.com with ESMTPSA id f17sm2848968wmh.10.2020.11.04.08.36.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2020 08:36:03 -0800 (PST) From: Alberto Milone To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/2 F][SRU][oem-5.6][L-R-M] UBUNTU: [Packaging] NVIDIA -- provide the nvidia-prebuilt-kernel virtual package Date: Wed, 4 Nov 2020 17:35:54 +0100 Message-Id: <20201104163555.503318-2-alberto.milone@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201104163555.503318-1-alberto.milone@canonical.com> References: <20201104163555.503318-1-alberto.milone@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Make all the NVIDIA drivers provide the nvidia-prebuilt-kernel virtual package. This allows adding a generic dependency on the signed modules. BugLink: https://bugs.launchpad.net/bugs/1902093 Signed-off-by: Alberto Milone --- debian/control.d/meta-nvidia | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control.d/meta-nvidia b/debian/control.d/meta-nvidia index b5115bf..509c366 100644 --- a/debian/control.d/meta-nvidia +++ b/debian/control.d/meta-nvidia @@ -2,7 +2,7 @@ Package: linux-modules-nvidia-450${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-oem (= ${binary:Version}), ${nvk:nvidia-450} Description: Extra drivers for nvidia-450 for the OEM flavour From patchwork Wed Nov 4 16:35: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: 1394263 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 4CRC2m2XThz9sT6; Thu, 5 Nov 2020 03:36:16 +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 1kaLld-0005eZ-Ig; Wed, 04 Nov 2020 16:36:13 +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 1kaLlY-0005cg-M4 for kernel-team@lists.ubuntu.com; Wed, 04 Nov 2020 16:36:08 +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 1kaLlY-0007Ll-E3 for kernel-team@lists.ubuntu.com; Wed, 04 Nov 2020 16:36:08 +0000 Received: by mail-wm1-f72.google.com with SMTP id 8so819477wmg.6 for ; Wed, 04 Nov 2020 08:36:08 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=A4OZrIDO0GNRqzKVsFE6xCgd/oUD17eI89M0aCcojxI=; b=oddgaEV97/YoNUWLolk4bgJQ9wFsPTJj4/t4RgdZfJriE7X0eBz4AqBiIStvnuig/1 jc8e9xe7Q1JEJAkkCsuTDOFzrK83oFemOlTvacZNyVmkzBR/LHQdWNA/YYRFw4DfnOi9 5RSG9g0sNKT8FlRbiz7djSDCv6Kvee8mgyr/3tZVYPiwNcg3ixI9IP2jY4gWOFLm6Man DafmeisTjKGBpFl19rHooGYEH0VUUBUDZ7IRqBoGAr1IQaRQGctEt4QlUe03fWPXxtmm dDgHup10upJ0LERkycSYUm06FPpaj/oaGQCCrbHDPvcVaOq8FGbo+rkI24pRX+cky+et eYdw== X-Gm-Message-State: AOAM5317lCQn4UDgj/AM4DnjgPmRGCVPQCtzfBdo5ImnDmPygtsfCaAQ 86I+rwUbExIPENx/KarDfoMqmgj66+IHNxK6V4EzLXE0jY9SsBf7paPO72HRPkBaS6r/RP8+q4g IEu1w8TWwR3eBRsD1cr05N2hFOtJnxlL3crY61jrM1Q== X-Received: by 2002:a1c:1f06:: with SMTP id f6mr5248390wmf.108.1604507767830; Wed, 04 Nov 2020 08:36:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJzgSlIBB2yKgBBoQFmywwhls8MQOpP8YtaG6wE9ysEE/6nekivjs6t7kP+PVeCJJM6R6QscDg== X-Received: by 2002:a1c:1f06:: with SMTP id f6mr5248365wmf.108.1604507767540; Wed, 04 Nov 2020 08:36:07 -0800 (PST) Received: from thinkpad.lan (dynamic-adsl-94-34-39-30.clienti.tiscali.it. [94.34.39.30]) by smtp.gmail.com with ESMTPSA id f17sm2848968wmh.10.2020.11.04.08.36.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2020 08:36:07 -0800 (PST) From: Alberto Milone To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/2 F][SRU][oem-5.6][L-R-M] UBUNTU: [Packaging] NVIDIA -- Add the 455 driver Date: Wed, 4 Nov 2020 17:35:55 +0100 Message-Id: <20201104163555.503318-3-alberto.milone@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201104163555.503318-1-alberto.milone@canonical.com> References: <20201104163555.503318-1-alberto.milone@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Add the 455 series. BugLink: https://bugs.launchpad.net/bugs/1902093 Signed-off-by: Alberto Milone --- debian/control.d/meta-nvidia | 10 ++++++++++ debian/control.d/nvidia | 14 ++++++++++++++ debian/dkms-versions | 1 + debian/rules | 6 ++++++ 4 files changed, 31 insertions(+) diff --git a/debian/control.d/meta-nvidia b/debian/control.d/meta-nvidia index 509c366..631bd87 100644 --- a/debian/control.d/meta-nvidia +++ b/debian/control.d/meta-nvidia @@ -7,3 +7,13 @@ 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. + +Package: linux-modules-nvidia-455${variant:suffix} +Build-Profiles: +Architecture: amd64 +Section: kernel +Provides: ${dkms:nvidia-455-modules}, nvidia-prebuilt-kernel +Depends: ${misc:Depends}, linux-modules-nvidia-455-ABI-oem (= ${binary:Version}), + ${nvk:nvidia-455} +Description: Extra drivers for nvidia-455 for the OEM flavour + Install extra signed nvidia-455 modules compatible with the OEM flavour. diff --git a/debian/control.d/nvidia b/debian/control.d/nvidia index b0dd828..73cc6e0 100644 --- a/debian/control.d/nvidia +++ b/debian/control.d/nvidia @@ -11,3 +11,17 @@ Description: 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-455-ABI-oem +Build-Profiles: +Architecture: amd64 +Section: kernel +Priority: optional +Built-Using: ${linux:BuiltUsing} +Depends: ${misc:Depends}, ${shlibs:Depends}, binutils, linux-image-ABI-oem | linux-image-unsigned-ABI-oem +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. diff --git a/debian/dkms-versions b/debian/dkms-versions index 3acf966..d625db4 100644 --- a/debian/dkms-versions +++ b/debian/dkms-versions @@ -1,3 +1,4 @@ zfs-linux 0.8.3-1ubuntu12.4 nvidia-graphics-drivers-450 450.66-0ubuntu0.20.04.1 +nvidia-graphics-drivers-455 0 virtualbox 6.1.10-dfsg-1~ubuntu1.20.04.1 diff --git a/debian/rules b/debian/rules index 5fe08ba..607a446 100755 --- a/debian/rules +++ b/debian/rules @@ -17,8 +17,10 @@ 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_450_version=$(shell gawk '/^nvidia-graphics-drivers-450 / { print $$2; }' debian/dkms-versions) +dkms_nvidia_455_version=$(shell gawk '/^nvidia-graphics-drivers-455 / { print $$2; }' debian/dkms-versions) nvidia_450_upstream_version=$(shell echo "$(dkms_nvidia_450_version)" | cut -d '-' -f 1) +nvidia_455_upstream_version=$(shell echo "$(dkms_nvidia_455_version)" | cut -d '-' -f 1) # Get variants, assumng primary if debian/variants is not present variants = -- @@ -129,6 +131,8 @@ nvidia-%: 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) + $(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) prepare-dkms: mkdir -p $(dkms_dir) @@ -138,8 +142,10 @@ override_dh_auto_install: prepare-dkms $(flavours) dh_install gencontrol_flags += -Vdkms:nvidia-450-modules="nvidia-dkms-450 (= $(dkms_nvidia_450_version))" +gencontrol_flags += -Vdkms:nvidia-455-modules="nvidia-dkms-455 (= $(dkms_nvidia_455_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-455="nvidia-kernel-common-455 (<= $(nvidia_455_upstream_version)-1), nvidia-kernel-common-455 (>= $(nvidia_455_upstream_version))" override_dh_gencontrol: dh_gencontrol -- $(gencontrol_flags)