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)