From patchwork Wed Nov 4 17:23: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: 1394406 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 4CRD66742kz9sTL; Thu, 5 Nov 2020 04:24:14 +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 1kaMW4-0000uj-8t; Wed, 04 Nov 2020 17:24:12 +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 1kaMW2-0000u6-EY for kernel-team@lists.ubuntu.com; Wed, 04 Nov 2020 17:24:10 +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 1kaMW2-0002cM-6r for kernel-team@lists.ubuntu.com; Wed, 04 Nov 2020 17:24:10 +0000 Received: by mail-wm1-f69.google.com with SMTP id z62so1407613wmb.1 for ; Wed, 04 Nov 2020 09:24:10 -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=YDuR545kjYYl8QG77iEfUPfzt3N+eJZX07O8JrOrm8Y=; b=Wn2+eObBnGzuPkWdCEQzO4hHCz+1olOHihFvEsSZNfheVhb/uaGV/Vx0cN3irwP5/Y 5M83TgIotPYvZ3iNYni5KFdBx/hXA6SjwIjc2QYhCB2ixAUe0BKXlWZq57DOHVFmjKVb L3+4yT9fgE1GX0ZT9lPGlQGFa46To0+Ey8vrh1or6wXYmKkZ+0nADZEiQf7XDArDfw1q oIXepzJ0VPOOoHe9fzp8jCVV9H4Fo8bMxQWhdKR9eVbt/50k81tS/LjEBCL8jt9fCHW7 2cAGzfLirtWh9b5h9tJd/3xFyhJhJYmBkmzcrmtcLEh22LNab145WRACR8te2EQfJkjL 10bQ== X-Gm-Message-State: AOAM530dsz81uGOZ8RZSivMPdu7GscEFSpcpAxzkzYZLzptGOzC4rlmS cVM2/TYVECR/L48YfoJayv9PEQQ2R5td5BWbfoPopGRldUBAzj0CAtGImQOtKC1/sm4bl5gSYI3 CXK6vLGpxDnA/kCj9LXyjMxqJFrEk2qqoY8J4xXEhNQ== X-Received: by 2002:adf:e9cc:: with SMTP id l12mr27606050wrn.248.1604510649432; Wed, 04 Nov 2020 09:24:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJxgquAg+C5B8y/5WMDz9VwP5iMrFoDtfec0srjVD9ItRZPvHeh6HNcrMNSrHQtE1RbBCff/Gg== X-Received: by 2002:adf:e9cc:: with SMTP id l12mr27606027wrn.248.1604510649104; Wed, 04 Nov 2020 09:24:09 -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 z11sm3388424wrr.66.2020.11.04.09.24.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2020 09:24:08 -0800 (PST) From: Alberto Milone To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/2 B][SRU][hwe-5.4][L-R-M] UBUNTU: [Packaging] NVIDIA -- Add the 455 driver Date: Wed, 4 Nov 2020 18:23:53 +0100 Message-Id: <20201104172353.554876-3-alberto.milone@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201104172353.554876-1-alberto.milone@canonical.com> References: <20201104172353.554876-1-alberto.milone@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Add the 455 series, and drop the 435 series. BugLink: https://bugs.launchpad.net/bugs/1902093 Signed-off-by: Alberto Milone --- debian/control.d/meta-nvidia | 24 +++++++++++------------ debian/control.d/nvidia | 8 ++++---- debian/control.d/transitionals-nvidia-435 | 13 ++++++++++++ debian/control.d/upgrade-meta-nvidia-435 | 17 ++++++++++++++++ debian/dkms-versions | 2 +- debian/rules | 16 +++++++-------- 6 files changed, 55 insertions(+), 25 deletions(-) create mode 100644 debian/control.d/transitionals-nvidia-435 create mode 100644 debian/control.d/upgrade-meta-nvidia-435 diff --git a/debian/control.d/meta-nvidia b/debian/control.d/meta-nvidia index c858688..001e257 100644 --- a/debian/control.d/meta-nvidia +++ b/debian/control.d/meta-nvidia @@ -11,17 +11,17 @@ Description: Extra drivers for nvidia-390 for generic${variant:suffix} Install extra signed nvidia-390 modules compatible with generic${variant:suffix} -Package: linux-modules-nvidia-435-generic${variant:suffix} +Package: linux-modules-nvidia-455-generic${variant:suffix} Build-Profiles: Architecture: amd64 Section: kernel -Provides: ${dkms:nvidia-435-modules}, nvidia-prebuilt-kernel +Provides: ${dkms:nvidia-455-modules}, nvidia-prebuilt-kernel Depends: ${misc:Depends}, - linux-modules-nvidia-435-@ABI@-generic (= ${binary:Version}), - ${nvk:nvidia-435} -Description: Extra drivers for nvidia-435 for generic${variant:suffix} - Install extra signed nvidia-435 modules compatible with + linux-modules-nvidia-455-@ABI@-generic (= ${binary:Version}), + ${nvk:nvidia-455} +Description: Extra drivers for nvidia-455 for generic${variant:suffix} + Install extra signed nvidia-455 modules compatible with generic${variant:suffix} Package: linux-modules-nvidia-450-generic${variant:suffix} @@ -89,17 +89,17 @@ Description: Extra drivers for nvidia-390 for lowlatency${variant:suffix} Install extra signed nvidia-390 modules compatible with lowlatency${variant:suffix} -Package: linux-modules-nvidia-435-lowlatency${variant:suffix} +Package: linux-modules-nvidia-455-lowlatency${variant:suffix} Build-Profiles: Architecture: amd64 Section: kernel -Provides: ${dkms:nvidia-435-modules}, nvidia-prebuilt-kernel +Provides: ${dkms:nvidia-455-modules}, nvidia-prebuilt-kernel Depends: ${misc:Depends}, - linux-modules-nvidia-435-@ABI@-lowlatency (= ${binary:Version}), - ${nvk:nvidia-435} -Description: Extra drivers for nvidia-435 for lowlatency${variant:suffix} - Install extra signed nvidia-435 modules compatible with + linux-modules-nvidia-455-@ABI@-lowlatency (= ${binary:Version}), + ${nvk:nvidia-455} +Description: Extra drivers for nvidia-455 for lowlatency${variant:suffix} + Install extra signed nvidia-455 modules compatible with lowlatency${variant:suffix} Package: linux-modules-nvidia-450-lowlatency${variant:suffix} diff --git a/debian/control.d/nvidia b/debian/control.d/nvidia index 383c55d..7558620 100644 --- a/debian/control.d/nvidia +++ b/debian/control.d/nvidia @@ -17,7 +17,7 @@ Description: Linux kernel nvidia modules for version @ABI@ which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-modules-nvidia-435-@ABI@-generic +Package: linux-modules-nvidia-455-@ABI@-generic Build-Profiles: Architecture: amd64 Section: kernel @@ -32,7 +32,7 @@ Description: Linux kernel nvidia modules for version @ABI@ This package contains the Linux kernel nvidia modules for version @ABI@. . You likely do not want to install this package directly. Instead, install the - one of the linux-modules-nvidia-435-generic* meta-packages, + one of the linux-modules-nvidia-455-generic* meta-packages, which will ensure that upgrades work correctly, and that supporting packages are also installed. @@ -131,7 +131,7 @@ Description: Linux kernel nvidia modules for version @ABI@ which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-modules-nvidia-435-@ABI@-lowlatency +Package: linux-modules-nvidia-455-@ABI@-lowlatency Build-Profiles: Architecture: amd64 Section: kernel @@ -146,7 +146,7 @@ Description: Linux kernel nvidia modules for version @ABI@ This package contains the Linux kernel nvidia modules for version @ABI@. . You likely do not want to install this package directly. Instead, install the - one of the linux-modules-nvidia-435-lowlatency* meta-packages, + one of the linux-modules-nvidia-455-lowlatency* meta-packages, which will ensure that upgrades work correctly, and that supporting packages are also installed. diff --git a/debian/control.d/transitionals-nvidia-435 b/debian/control.d/transitionals-nvidia-435 new file mode 100644 index 0000000..9419998 --- /dev/null +++ b/debian/control.d/transitionals-nvidia-435 @@ -0,0 +1,13 @@ +Package: linux-modules-nvidia-435-generic +Architecture: amd64 +Section: oldlibs +Depends: linux-modules-nvidia-455-generic +Description: Extra drivers for nvidia-435 for the generic flavour (dummy transitional package) + Transitional package for upgrades of -435 to -455. + +Package: linux-modules-nvidia-435-lowlatency +Architecture: amd64 +Section: oldlibs +Depends: linux-modules-nvidia-455-lowlatency +Description: Extra drivers for nvidia-435 for the generic flavour (dummy transitional package) + Transitional package for upgrades of -435 to -455. diff --git a/debian/control.d/upgrade-meta-nvidia-435 b/debian/control.d/upgrade-meta-nvidia-435 new file mode 100644 index 0000000..b4769b7 --- /dev/null +++ b/debian/control.d/upgrade-meta-nvidia-435 @@ -0,0 +1,17 @@ +Package: linux-modules-nvidia-435-generic${variant:suffix} +Build-Profiles: +Architecture: amd64 +Section: kernel +Depends: linux-modules-nvidia-455-generic${variant:suffix} +Description: Transitional package for linux-modules-nvidia-455-generic${variant:suffix} + This is a transitional package for linux-modules-nvidia-455-generic${variant:suffix}, + and can be safely removed after the installation is complete. + +Package: linux-modules-nvidia-435-lowlatency${variant:suffix} +Build-Profiles: +Architecture: amd64 +Section: kernel +Depends: linux-modules-nvidia-455-lowlatency${variant:suffix} +Description: Transitional package for linux-modules-nvidia-455-lowlatency${variant:suffix} + This is a transitional package for linux-modules-nvidia-455-lowlatency${variant:suffix}, + and can be safely removed after the installation is complete. diff --git a/debian/dkms-versions b/debian/dkms-versions index 149992e..79f48b8 100644 --- a/debian/dkms-versions +++ b/debian/dkms-versions @@ -1,6 +1,6 @@ zfs-linux 0.8.3-1ubuntu12.4 nvidia-graphics-drivers-390 390.138-0ubuntu0.20.04.1 -nvidia-graphics-drivers-435 435.21-0ubuntu7 +nvidia-graphics-drivers-455 0 nvidia-graphics-drivers-450 450.80.02-0ubuntu0.20.04.2 nvidia-graphics-drivers-418-server 418.152.00-0ubuntu0.20.04.1 nvidia-graphics-drivers-440-server 440.95.01-0ubuntu0.20.04.1 diff --git a/debian/rules b/debian/rules index 91dcab6..744645a 100755 --- a/debian/rules +++ b/debian/rules @@ -14,14 +14,14 @@ src_series = $(shell dpkg-parsechangelog -SDistribution | sed -e 's/-\(security\ src_kernel = $(shell echo "$(src_package)" | sed -e 's/restricted-modules-//') dkms_nvidia_390_version=$(shell gawk '/^nvidia-graphics-drivers-390 / { print $$2; }' debian/dkms-versions) -dkms_nvidia_435_version=$(shell gawk '/^nvidia-graphics-drivers-435 / { print $$2; }' debian/dkms-versions) +dkms_nvidia_455_version=$(shell gawk '/^nvidia-graphics-drivers-455 / { print $$2; }' debian/dkms-versions) dkms_nvidia_450_version=$(shell gawk '/^nvidia-graphics-drivers-450 / { print $$2; }' debian/dkms-versions) dkms_nvidia_418_server_version=$(shell gawk '/^nvidia-graphics-drivers-418-server / { print $$2; }' debian/dkms-versions) dkms_nvidia_440_server_version=$(shell gawk '/^nvidia-graphics-drivers-440-server / { print $$2; }' debian/dkms-versions) dkms_nvidia_450_server_version=$(shell gawk '/^nvidia-graphics-drivers-450-server / { print $$2; }' debian/dkms-versions) nvidia_390_upstream_version=$(shell echo "$(dkms_nvidia_390_version)" | cut -d '-' -f 1) -nvidia_435_upstream_version=$(shell echo "$(dkms_nvidia_435_version)" | cut -d '-' -f 1) +nvidia_455_upstream_version=$(shell echo "$(dkms_nvidia_455_version)" | cut -d '-' -f 1) nvidia_450_upstream_version=$(shell echo "$(dkms_nvidia_450_version)" | cut -d '-' -f 1) nvidia_418_server_upstream_version=$(shell echo "$(dkms_nvidia_418_server_version)" | cut -d '-' -f 1) nvidia_440_server_upstream_version=$(shell echo "$(dkms_nvidia_440_server_version)" | cut -d '-' -f 1) @@ -140,10 +140,10 @@ nvidia-%: $(call build_dkms, $(src_abi)-$*, linux-modules-nvidia-390-$(src_abi)-$*, $(CURDIR)/debian/linux-modules-nvidia-390-$(src_abi)-$*/lib/modules/$(src_abi)-$*/kernel, "", nvidia-390, pool/restricted/n/nvidia-graphics-drivers-390/nvidia-kernel-source-390_$(dkms_nvidia_390_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-390/nvidia-dkms-390_$(dkms_nvidia_390_version)_$(arch).deb) $(call install_control,linux-modules-nvidia-390-$(src_abi)-$*,$*,nvidia,390,postinst postrm prerm config templates) - install -d debian/linux-modules-nvidia-435-$(src_abi)-$* - install -d debian/linux-modules-nvidia-435-$(src_abi)-$*/usr/lib/linux/triggers - $(call build_dkms, $(src_abi)-$*, linux-modules-nvidia-435-$(src_abi)-$*, $(CURDIR)/debian/linux-modules-nvidia-435-$(src_abi)-$*/lib/modules/$(src_abi)-$*/kernel, "", nvidia-435, pool/restricted/n/nvidia-graphics-drivers-435/nvidia-kernel-source-435_$(dkms_nvidia_435_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-435/nvidia-dkms-435_$(dkms_nvidia_435_version)_$(arch).deb) - $(call install_control,linux-modules-nvidia-435-$(src_abi)-$*,$*,nvidia,435,postinst postrm prerm config templates) + install -d debian/linux-modules-nvidia-455-$(src_abi)-$* + install -d debian/linux-modules-nvidia-455-$(src_abi)-$*/usr/lib/linux/triggers + $(call build_dkms, $(src_abi)-$*, linux-modules-nvidia-455-$(src_abi)-$*, $(CURDIR)/debian/linux-modules-nvidia-455-$(src_abi)-$*/lib/modules/$(src_abi)-$*/kernel, "", nvidia-455, pool/restricted/n/nvidia-graphics-drivers-455/nvidia-kernel-source-455_$(dkms_nvidia_455_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-455/nvidia-dkms-455_$(dkms_nvidia_455_version)_$(arch).deb) + $(call install_control,linux-modules-nvidia-455-$(src_abi)-$*,$*,nvidia,455,postinst postrm prerm config templates) install -d debian/linux-modules-nvidia-450-$(src_abi)-$* install -d debian/linux-modules-nvidia-450-$(src_abi)-$*/usr/lib/linux/triggers @@ -177,14 +177,14 @@ override_dh_auto_install: prepare-dkms $(flavours) gencontrol_flags := gencontrol_flags += -Vdkms:nvidia-390-modules="nvidia-dkms-390 (= $(dkms_nvidia_390_version))" -gencontrol_flags += -Vdkms:nvidia-435-modules="nvidia-dkms-435 (= $(dkms_nvidia_435_version))" +gencontrol_flags += -Vdkms:nvidia-455-modules="nvidia-dkms-455 (= $(dkms_nvidia_455_version))" gencontrol_flags += -Vdkms:nvidia-450-modules="nvidia-dkms-450 (= $(dkms_nvidia_450_version))" gencontrol_flags += -Vdkms:nvidia-418-server-modules="nvidia-dkms-418-server (= $(dkms_nvidia_418_server_version))" gencontrol_flags += -Vdkms:nvidia-440-server-modules="nvidia-dkms-440-server (= $(dkms_nvidia_440_server_version))" gencontrol_flags += -Vdkms:nvidia-450-server-modules="nvidia-dkms-450-server (= $(dkms_nvidia_450_server_version))" gencontrol_flags += -Vnvk:nvidia-390="nvidia-kernel-common-390 (<= $(nvidia_390_upstream_version)-1), nvidia-kernel-common-390 (>= $(nvidia_390_upstream_version))" -gencontrol_flags += -Vnvk:nvidia-435="nvidia-kernel-common-435 (<= $(nvidia_435_upstream_version)-1), nvidia-kernel-common-435 (>= $(nvidia_435_upstream_version))" +gencontrol_flags += -Vnvk:nvidia-455="nvidia-kernel-common-455 (<= $(nvidia_455_upstream_version)-1), nvidia-kernel-common-455 (>= $(nvidia_455_upstream_version))" gencontrol_flags += -Vnvk:nvidia-450="nvidia-kernel-common-450 (<= $(nvidia_450_upstream_version)-1), nvidia-kernel-common-450 (>= $(nvidia_450_upstream_version))" gencontrol_flags += -Vnvk:nvidia-418-server="nvidia-kernel-common-418-server (<= $(nvidia_418_server_upstream_version)-1), nvidia-kernel-common-418-server (>= $(nvidia_418_server_upstream_version))" gencontrol_flags += -Vnvk:nvidia-440-server="nvidia-kernel-common-440-server (<= $(nvidia_440_server_upstream_version)-1), nvidia-kernel-common-440-server (>= $(nvidia_440_server_upstream_version))"