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)