From patchwork Fri Aug 21 17:00:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Milone X-Patchwork-Id: 1349425 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 4BY77N4Gtsz9sR4; Sat, 22 Aug 2020 03:00:32 +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 1k9AOz-0003Rb-2i; Fri, 21 Aug 2020 17:00:29 +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 1k9AOx-0003RO-Me for kernel-team@lists.ubuntu.com; Fri, 21 Aug 2020 17:00:27 +0000 Received: from mail-wr1-f69.google.com ([209.85.221.69]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1k9AOx-0002Ii-FD for kernel-team@lists.ubuntu.com; Fri, 21 Aug 2020 17:00:27 +0000 Received: by mail-wr1-f69.google.com with SMTP id j2so740089wrr.14 for ; Fri, 21 Aug 2020 10:00:27 -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:mime-version :content-transfer-encoding; bh=59Tm+SBANsX/1/5sO9fc+6exfD2QjSKszenW32uOlf4=; b=DWrsjblczbITkGFT6nKn/5x9bXT2nW0vFZTVG2Hf3xbo69JmzyLFmzxF6Dpu4xkjD7 8l0AmIV5PA5WP1WfG7rV8ZqYilraHkx8wQnBxMmFQlzgbg5e7u7+JCxbVYmxPCANo5kf fV8ziaNtmzrPQG4o9jhqoWcSk5OUJeVthBYIratdgmNCm/dmT9goSHD0ruEoVcKFyXKD vvagGpj1N0dGMf1bOikFQkLq7vasEEvDeRQpKP4vAmrkn5UodFpqCo0+ihNyuekl9f0/ us2cKeivWyZZtGzkY64MOKMaTEld6Xucu5Nb1pRsLbpYYrcYZJ5L6Wid3RCKWqqKssWR qSvg== X-Gm-Message-State: AOAM533raYbl3LYNerL8roztEmbwiMcMsJVtc4dJeq4VeSrKQyfQgAgL DOMwInC4ymquA6fSqdMBpPANL/gGljNYbYOumGnCCHnx1Kwx7AifduLniAFYDaajANVEpRZ013+ 3kFQg9AMgEPjzaWNIx5BYuXpzvRx5ShZcltI0kI1VRg== X-Received: by 2002:a1c:1b8f:: with SMTP id b137mr4298258wmb.151.1598029226399; Fri, 21 Aug 2020 10:00:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzYwSTKB6xjYDiMecStWmBTsF3iA2MTBFsqEARANNFlwOKIMJqnciiHEKtBjSXVC8u17/is1g== X-Received: by 2002:a1c:1b8f:: with SMTP id b137mr4298196wmb.151.1598029225669; Fri, 21 Aug 2020 10:00:25 -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 m126sm6601770wmf.3.2020.08.21.10.00.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Aug 2020 10:00:25 -0700 (PDT) From: Alberto Milone To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/1] [B/Oracle-5.3][L-R-M] UBUNTU: [packaging] replace nvidia 440 with nvidia 450 driver Date: Fri, 21 Aug 2020 19:00:22 +0200 Message-Id: <20200821170022.2196968-1-alberto.milone@canonical.com> X-Mailer: git-send-email 2.25.1 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" Replace the 440 series with the 440 series and add transitional packages. 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/update-nvidia-440 | 10 ++++++++++ debian/dkms-versions | 2 +- debian/rules | 16 ++++++++-------- 5 files changed, 27 insertions(+), 17 deletions(-) create mode 100644 debian/control.d/update-nvidia-440 -- 2.25.1 diff --git a/debian/control.d/meta-nvidia b/debian/control.d/meta-nvidia index 1d0f531..23285e0 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-440-oracle${variant:suffix} +Package: linux-modules-nvidia-450-oracle${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@-oracle (= ${binary:Version}), - ${nvk:nvidia-440} -Description: Extra drivers for nvidia-440 for oracle${variant:suffix} - Install extra signed nvidia-440 modules compatible with + linux-modules-nvidia-450-@ABI@-oracle (= ${binary:Version}), + ${nvk:nvidia-450} +Description: Extra drivers for nvidia-450 for oracle${variant:suffix} + Install extra signed nvidia-450 modules compatible with oracle${variant:suffix} Package: linux-modules-nvidia-435-oracle${variant:suffix} diff --git a/debian/control.d/nvidia b/debian/control.d/nvidia index 302dde1..d5fcfd5 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-440-@ABI@-oracle +Package: linux-modules-nvidia-450-@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-440-oracle* meta-packages, + one of the linux-modules-nvidia-450-oracle* meta-packages, which will ensure that upgrades work correctly, and that supporting packages are also installed. diff --git a/debian/control.d/update-nvidia-440 b/debian/control.d/update-nvidia-440 new file mode 100644 index 0000000..b624163 --- /dev/null +++ b/debian/control.d/update-nvidia-440 @@ -0,0 +1,10 @@ +Package: linux-modules-nvidia-440-@ABI@-oracle +Build-Profiles: +Architecture: amd64 +Section: kernel +Priority: optional +Built-Using: ${linux:BuiltUsing} +Depends: linux-modules-nvidia-450-@ABI@-oracle +Description: Transitional package for linux-modules-nvidia-450-ABI-oracle + This is a transitional package for linux-modules-nvidia-450-ABI-oracle, + and can be safely removed after the installation is complete. diff --git a/debian/dkms-versions b/debian/dkms-versions index 6b0c327..d76fb1b 100644 --- a/debian/dkms-versions +++ b/debian/dkms-versions @@ -1,6 +1,6 @@ zfs-linux 0.8.1-1ubuntu14.4 nvidia-graphics-drivers-390 390.138-0ubuntu0.19.10.1 -nvidia-graphics-drivers-440 440.100-0ubuntu0.19.10.1 +nvidia-graphics-drivers-450 0 nvidia-graphics-drivers-435 435.21-0ubuntu2 virtualbox 6.0.14-dfsg-1 wireguard-linux-compat 1.0.20200506-1~19.10.2 diff --git a/debian/rules b/debian/rules index 3955cee..f1bdfdf 100755 --- a/debian/rules +++ b/debian/rules @@ -14,12 +14,12 @@ 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_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) dkms_nvidia_435_version=$(shell gawk '/^nvidia-graphics-drivers-435/ { 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 = -- @@ -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-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) install -d debian/linux-modules-nvidia-435-$(src_abi)-$* install -d debian/linux-modules-nvidia-435-$(src_abi)-$*/usr/lib/linux/triggers @@ -156,12 +156,12 @@ 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-440-modules="nvidia-dkms-440 (= $(dkms_nvidia_440_version))" +gencontrol_flags += -Vdkms:nvidia-450-modules="nvidia-dkms-450 (= $(dkms_nvidia_450_version))" gencontrol_flags += -Vdkms:nvidia-435-modules="nvidia-dkms-435 (= $(dkms_nvidia_435_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)