From patchwork Mon Mar 16 11:24:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Milone X-Patchwork-Id: 1255416 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 48gv8r1Zdpz9sPk; Mon, 16 Mar 2020 22:24:44 +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 1jDnrK-0007qo-C2; Mon, 16 Mar 2020 11:24:38 +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 1jDnrI-0007qg-KS for kernel-team@lists.ubuntu.com; Mon, 16 Mar 2020 11:24:36 +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 1jDnrI-0007CE-BE for kernel-team@lists.ubuntu.com; Mon, 16 Mar 2020 11:24:36 +0000 Received: by mail-wm1-f70.google.com with SMTP id z26so4793227wmk.1 for ; Mon, 16 Mar 2020 04:24:36 -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=fbNSoy7FRjXWWBF5Dh53id+3OkKydHwXHRfrIXkGG4g=; b=KhkcwRszeYHaS53aI9clrNoBPKYC79Tpr4GswmHB5ewAspNbQel652a9Yb0JYVbC+Z lXauu0Ruxsy9/gdKZdZ3xOAMwv9rBlEavn+nJ6KZ1IP4eGAzRyh+TQ7BsdTR9/IEiP/X Q6fQT9zbgnFJAn9ko8GyC8Ex4uWgQuuloNuUjyR15a55MMoT1pOEPmMFdPJgJ6lCC3mk JaECia8KB62cbJXoutoi+W90+zVAEy5vjpEkCMqa/bysZw0UiHJj8L0u2oFSvYoiatFf 7V5MzGG6E9X4Byn+9DOegxoImWls/ZYC8VwlZ1UOyNeTf73JeJIPx5tKgcM+ng8mPbUm PJ0w== X-Gm-Message-State: ANhLgQ3CZe9bm/qTHnAb2nAjSP78Rqx3xf6cfg4NF9+jUhM8JYKBGxt3 J97KKw44THMJ0+6fGjuu2yi8B+if6t6HBhmRJcwdgNL4LPbTUyGJPORksQEgFQMdKRXi4kIKOSR Um3wPRvh5F1Y5JvJILeg9WdQDQu3xTkrHG33+o/vdMQ== X-Received: by 2002:a7b:c08a:: with SMTP id r10mr27047947wmh.130.1584357875692; Mon, 16 Mar 2020 04:24:35 -0700 (PDT) X-Google-Smtp-Source: ADFU+vtdrQxePh4xrWSJpZv0YpfrkmLSVkx3DJBIXOWP+g1sh7kToMK2CJecyIWbryeZn0EFsh9CeA== X-Received: by 2002:a7b:c08a:: with SMTP id r10mr27047918wmh.130.1584357875320; Mon, 16 Mar 2020 04:24:35 -0700 (PDT) Received: from thinkpad.lan (dynamic-adsl-94-34-30-222.clienti.tiscali.it. [94.34.30.222]) by smtp.gmail.com with ESMTPSA id j39sm14943717wre.11.2020.03.16.04.24.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2020 04:24:34 -0700 (PDT) From: Alberto Milone To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/2 E][SRU][l-r-m]UBUNTU: [Packaging] NVIDIA -- add the 440 series Date: Mon, 16 Mar 2020 12:24:25 +0100 Message-Id: <20200316112425.30698-3-alberto.milone@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200316112425.30698-1-alberto.milone@canonical.com> References: <20200316112425.30698-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 support for the 440 series in the linux-restricted-modules, and add transitional packages to migrate users from the 430 series. BugLink: https://bugs.launchpad.net/bugs/1854485 Signed-off-by: Alberto Milone --- debian/control.stub | 60 +++++++++++++++++++++++++++++++++++++-------- debian/rules | 10 ++++---- 2 files changed, 55 insertions(+), 15 deletions(-) -- 2.20.1 diff --git a/debian/control.stub b/debian/control.stub index 39114e8..2b5b416 100644 --- a/debian/control.stub +++ b/debian/control.stub @@ -62,13 +62,13 @@ Depends: ${misc:Depends}, linux-modules-nvidia-390-ABI-lowlatency (= ${binary:Ve Description: Extra drivers for nvidia-390 for the lowlatency flavour Install extra signed nvidia-390 modules compatible with the lowlatency flavour. -Package: linux-modules-nvidia-430-ABI-generic +Package: linux-modules-nvidia-440-ABI-generic Build-Profiles: Architecture: amd64 Section: kernel Priority: optional Built-Using: ${linux:BuiltUsing} -Depends: ${misc:Depends}, ${shlibs:Depends}, binutils, linux-image-ABI-generic | linux-image-unsigned-ABI-generic, nvidia-kernel-common-430 +Depends: ${misc:Depends}, ${shlibs:Depends}, binutils, linux-image-ABI-generic | linux-image-unsigned-ABI-generic, nvidia-kernel-common-440 Description: Linux kernel nvidia modules for version ABI This package contains the Linux kernel nvidia modules for version ABI. . @@ -76,13 +76,13 @@ Description: Linux kernel nvidia modules for version ABI linux-image-nvidia-FLAVOUR meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-modules-nvidia-430-ABI-lowlatency +Package: linux-modules-nvidia-440-ABI-lowlatency Build-Profiles: Architecture: amd64 Section: kernel Priority: optional Built-Using: ${linux:BuiltUsing} -Depends: ${misc:Depends}, ${shlibs:Depends}, binutils, linux-image-ABI-lowlatency | linux-image-unsigned-ABI-lowlatency, nvidia-kernel-common-430 +Depends: ${misc:Depends}, ${shlibs:Depends}, binutils, linux-image-ABI-lowlatency | linux-image-unsigned-ABI-lowlatency, nvidia-kernel-common-440 Description: Linux kernel nvidia modules for version ABI This package contains the Linux kernel nvidia modules for version ABI. . @@ -90,21 +90,61 @@ Description: Linux kernel nvidia modules for version ABI linux-image-nvidia-FLAVOUR meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. +Package: linux-modules-nvidia-440-generic +Build-Profiles: +Architecture: amd64 +Section: kernel +Depends: ${misc:Depends}, linux-modules-nvidia-440-ABI-generic (= ${binary:Version}) +Description: Extra drivers for nvidia-440 for the generic flavour + Install extra signed nvidia-440 modules compatible with the generic flavour. + +Package: linux-modules-nvidia-440-lowlatency +Build-Profiles: +Architecture: amd64 +Section: kernel +Depends: ${misc:Depends}, linux-modules-nvidia-440-ABI-lowlatency (= ${binary:Version}) +Description: Extra drivers for nvidia-440 for the lowlatency flavour + Install extra signed nvidia-440 modules compatible with the lowlatency flavour. + +Package: linux-modules-nvidia-430-ABI-generic +Build-Profiles: +Architecture: amd64 +Section: kernel +Priority: optional +Built-Using: ${linux:BuiltUsing} +Depends: linux-modules-nvidia-440-ABI-generic +Description: Transitional package for linux-modules-nvidia-440-ABI-generic + This is a transitional package for linux-modules-nvidia-440-ABI-generic, and can be + safely removed after the installation is complete. + +Package: linux-modules-nvidia-430-ABI-lowlatency +Build-Profiles: +Architecture: amd64 +Section: kernel +Priority: optional +Built-Using: ${linux:BuiltUsing} +Depends: linux-modules-nvidia-440-ABI-lowlatency +Description: Transitional package for linux-modules-nvidia-440-ABI-lowlatency + This is a transitional package for linux-modules-nvidia-440-ABI-lowlatency, and can be + safely removed after the installation is complete. + Package: linux-modules-nvidia-430-generic Build-Profiles: Architecture: amd64 Section: kernel -Depends: ${misc:Depends}, linux-modules-nvidia-430-ABI-generic (= ${binary:Version}) -Description: Extra drivers for nvidia-430 for the generic flavour - Install extra signed nvidia-430 modules compatible with the generic flavour. +Depends: linux-modules-nvidia-440-generic +Description: Transitional package for linux-modules-nvidia-440-generic + This is a transitional package for linux-modules-nvidia-440-generic, and can be + safely removed after the installation is complete. Package: linux-modules-nvidia-430-lowlatency Build-Profiles: Architecture: amd64 Section: kernel -Depends: ${misc:Depends}, linux-modules-nvidia-430-ABI-lowlatency (= ${binary:Version}) -Description: Extra drivers for nvidia-430 for the lowlatency flavour - Install extra signed nvidia-430 modules compatible with the lowlatency flavour. +Depends: linux-modules-nvidia-440-lowlatency +Description: Transitional package for linux-modules-nvidia-440-lowlatency + This is a transitional package for linux-modules-nvidia-440-lowlatency, and can be + safely removed after the installation is complete. Package: linux-modules-nvidia-435-ABI-generic Build-Profiles: diff --git a/debian/rules b/debian/rules index 54040a5..a81226c 100755 --- a/debian/rules +++ b/debian/rules @@ -15,7 +15,7 @@ src_version = $(shell echo $(src_fullversion) | sed -e 's/+[0-9][0-9]*//') series = $(shell dpkg-parsechangelog | sed -ne 's/^Distribution: *//p' | sed -e 's/-\(security\|updates\|proposed\)$$//') dkms_nvidia_390_version=$(shell gawk '/^nvidia-graphics-drivers-390/ { print $$2; }' debian/dkms-versions) -dkms_nvidia_430_version=$(shell gawk '/^nvidia-graphics-drivers-430/ { print $$2; }' debian/dkms-versions) +dkms_nvidia_440_version=$(shell gawk '/^nvidia-graphics-drivers-440/ { print $$2; }' debian/dkms-versions) dkms_nvidia_435_version=$(shell gawk '/^nvidia-graphics-drivers-435/ { print $$2; }' debian/dkms-versions) test: @@ -94,10 +94,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-430-$(src_abi)-$* - install -d debian/linux-modules-nvidia-430-$(src_abi)-$*/usr/lib/linux/triggers - $(call build_dkms, $(src_abi)-$*, linux-modules-nvidia-430-$(src_abi)-$*, $(CURDIR)/debian/linux-modules-nvidia-430-$(src_abi)-$*/lib/modules/$(src_abi)-$*/kernel, "", nvidia-430, pool/restricted/n/nvidia-graphics-drivers-430/nvidia-kernel-source-430_$(dkms_nvidia_430_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-430/nvidia-dkms-430_$(dkms_nvidia_430_version)_$(arch).deb) - $(call install_control,linux-modules-nvidia-430-$(src_abi)-$*,$*,nvidia,430,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-435-$(src_abi)-$* install -d debian/linux-modules-nvidia-435-$(src_abi)-$*/usr/lib/linux/triggers