From patchwork Mon Jul 20 14:32:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Milone X-Patchwork-Id: 1332453 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 4B9PNB6vkMz9sSd; Tue, 21 Jul 2020 00:33:14 +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 1jxWqt-00038z-D4; Mon, 20 Jul 2020 14:33:11 +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 1jxWqr-00038j-UK for kernel-team@lists.ubuntu.com; Mon, 20 Jul 2020 14:33:09 +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 1jxWqr-0003T4-MR for kernel-team@lists.ubuntu.com; Mon, 20 Jul 2020 14:33:09 +0000 Received: by mail-wm1-f70.google.com with SMTP id z11so14299579wmg.5 for ; Mon, 20 Jul 2020 07:33:09 -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=ZxEZjOpqiCtNeLcCA/7KamtZr134k0m2/s6p+SzdP0Q=; b=aQQhsAGHy8SV5dHSLV0pRVhJ/jqr4zQBsDQhMRA5j+88rNiTlqJknefpPuTvrE1cRV CGqXtl5f01IyFVrQnGWw0v1yWnMnZSJuhOQMF704NfLl6/yEx/vu6QY4eoG6Oroyu2yw XBw7rXdvhiHLl22XiR996m/2yK6gMqzTTA76ph5x92dCdPnhwaTCvdoG4xzYHraweXj1 p2SbA391TG2lAwpLHeUWjfvPDL4T+rfywPFqyR8cSj1VjbqzsIVE9z3RnaitAg3CY49h ADLc3jP/z+vX0Ejg0t3zh4vlHDbqSw88Z3JIZQ/SiCCtX7iojfvPoz05dtVkmcnX3+yL 2XpA== X-Gm-Message-State: AOAM532of8/Tixf1fpDRmKZ2uSwXn40zlaS0rpTp3sVfENBze7rZPiCa vHZdb3eRAknqTW1zCteG2NK3mvmahUbAsM9gBonfvPV/HNSWs3wk5LZvAY/KzNGfNzw10SR2oEg jnlsXnNRwV2y9e7GyEu/l8teh2nO1eKc2ht072ZoU4Q== X-Received: by 2002:a7b:c5c5:: with SMTP id n5mr19782987wmk.103.1595255589028; Mon, 20 Jul 2020 07:33:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwbrUvJEiJ+Ws8lsSmmDOGrLR9hXi75udcLmSyyFVvZLLCveq4vMF9L/7tfIjuTBYkjmNPAWw== X-Received: by 2002:a7b:c5c5:: with SMTP id n5mr19782969wmk.103.1595255588800; Mon, 20 Jul 2020 07:33:08 -0700 (PDT) Received: from thinkpad.lan (dynamic-adsl-94-34-33-205.clienti.tiscali.it. [94.34.33.205]) by smtp.gmail.com with ESMTPSA id k126sm35120885wme.17.2020.07.20.07.33.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2020 07:33:08 -0700 (PDT) From: Alberto Milone To: kernel-team@lists.ubuntu.com Subject: [PATCH V2 1/5 G][L-R-M] UBUNTU: [Packaging] rules -- expose nvidia-kernel-common dependency data Date: Mon, 20 Jul 2020 16:32:50 +0200 Message-Id: <20200720143254.4136051-2-alberto.milone@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200720143254.4136051-1-alberto.milone@canonical.com> References: <20200720143254.4136051-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" Export the dependency data for use in control templates. BugLink: https://bugs.launchpad.net/bugs/1881137 Signed-off-by: Alberto Milone --- debian/rules | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/rules b/debian/rules index c6a6fc4..2dccec5 100755 --- a/debian/rules +++ b/debian/rules @@ -17,6 +17,10 @@ dkms_nvidia_390_version=$(shell gawk '/^nvidia-graphics-drivers-390/ { print $$2 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) +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) + # Get variants, assuming primary if debian/variants is not present variants = -- ifneq (,$(wildcard debian/variants)) @@ -155,5 +159,9 @@ gencontrol_flags += -Vdkms:nvidia-390-modules="nvidia-dkms-390 (= $(dkms_nvidia_ 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 += -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))" + override_dh_gencontrol: dh_gencontrol -- $(gencontrol_flags) From patchwork Mon Jul 20 14:32:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Milone X-Patchwork-Id: 1332455 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 4B9PNK67fYz9sSt; Tue, 21 Jul 2020 00:33:21 +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 1jxWr0-0003Bd-LA; Mon, 20 Jul 2020 14:33:18 +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 1jxWqz-0003BN-Ny for kernel-team@lists.ubuntu.com; Mon, 20 Jul 2020 14:33:17 +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 1jxWqz-0003TZ-H2 for kernel-team@lists.ubuntu.com; Mon, 20 Jul 2020 14:33:17 +0000 Received: by mail-wm1-f70.google.com with SMTP id q20so14321633wme.3 for ; Mon, 20 Jul 2020 07:33:17 -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=s4jcVSJ9hO/J5RhEIDXwA3URhBBWU5T964uEhipMvFA=; b=aOtHVsBygIk7bMCuaKTa7zsjUjmYhrKzOq4G+a/eg4O/B2Ymg5343KN5lX4+JQLWVP ZhT2aExP+66EWXhySYi8qNJouLnxI+dpXeKrSkr3rqgUlebKP8LacD3JJ0ky9zkwURHr 65pJyuW3PJeuPtcV0W6A6zKqJa3aOe7HxOE5HSd6FrTChq/hO4HQJC2+ePmM+Vn34duD 76xHj2PiyzCGK5jBzC/DjtsFA5GZ6Vo43NKIE/zUUzvkb5l+NFmdKW72ZuWHwhkON/D/ batvqxwRp2hmD5ArfjRN0I6ddepveMInhjqpIy7o52mihTwgMMnBYUKycjCAfuEtVbrw FdWA== X-Gm-Message-State: AOAM531aXSLpuRWUnE+6VZdhM0blfrq+6CCDlGFlx2QoFgMhZiWum4H1 GMkU35tHi7l9ojNlOYMsx+odTyblM+MGbtKbf0u/pbNo2dZ5YzFfAxCcOYxajB0FO4Y4undD1U6 00nWKVIIC5VoFRLFSpvv8iCaUVBiYCIJFRcKVYSo4RA== X-Received: by 2002:a7b:ca4c:: with SMTP id m12mr21953366wml.33.1595255596860; Mon, 20 Jul 2020 07:33:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwmp/r7/e4Ezxs5GcPXOnsu9jJykZb1Dw0YsyoXeCP+CyHvw4U8xN31OoARtUgdWPtPwNoMEA== X-Received: by 2002:a7b:ca4c:: with SMTP id m12mr21953350wml.33.1595255596656; Mon, 20 Jul 2020 07:33:16 -0700 (PDT) Received: from thinkpad.lan (dynamic-adsl-94-34-33-205.clienti.tiscali.it. [94.34.33.205]) by smtp.gmail.com with ESMTPSA id k126sm35120885wme.17.2020.07.20.07.33.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2020 07:33:15 -0700 (PDT) From: Alberto Milone To: kernel-team@lists.ubuntu.com Subject: [PATCH V2 2/5 G][L-R-M] UBUNTU: [packaging] expose dependency on nvidia-kernel-common on meta packages Date: Mon, 20 Jul 2020 16:32:51 +0200 Message-Id: <20200720143254.4136051-3-alberto.milone@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200720143254.4136051-1-alberto.milone@canonical.com> References: <20200720143254.4136051-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" Signed-off-by: Alberto Milone --- debian/control.d/meta-nvidia | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/debian/control.d/meta-nvidia b/debian/control.d/meta-nvidia index ad59f18..f3f1ba2 100644 --- a/debian/control.d/meta-nvidia +++ b/debian/control.d/meta-nvidia @@ -5,7 +5,8 @@ Section: kernel Provides: ${dkms:nvidia-390-modules} Depends: ${misc:Depends}, - linux-modules-nvidia-390-@ABI@-generic (= ${binary:Version}) + linux-modules-nvidia-390-@ABI@-generic (= ${binary:Version}), + ${nvk:nvidia-390} Description: Extra drivers for nvidia-390 for generic${variant:suffix} Install extra signed nvidia-390 modules compatible with generic${variant:suffix} @@ -17,7 +18,8 @@ Section: kernel Provides: ${dkms:nvidia-435-modules} Depends: ${misc:Depends}, - linux-modules-nvidia-435-@ABI@-generic (= ${binary:Version}) + 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 generic${variant:suffix} @@ -29,7 +31,8 @@ Section: kernel Provides: ${dkms:nvidia-440-modules} Depends: ${misc:Depends}, - linux-modules-nvidia-440-@ABI@-generic (= ${binary:Version}) + linux-modules-nvidia-440-@ABI@-generic (= ${binary:Version}), + ${nvk:nvidia-440} Description: Extra drivers for nvidia-440 for generic${variant:suffix} Install extra signed nvidia-440 modules compatible with generic${variant:suffix} @@ -41,7 +44,8 @@ Section: kernel Provides: ${dkms:nvidia-390-modules} Depends: ${misc:Depends}, - linux-modules-nvidia-390-@ABI@-lowlatency (= ${binary:Version}) + linux-modules-nvidia-390-@ABI@-lowlatency (= ${binary:Version}), + ${nvk:nvidia-390} Description: Extra drivers for nvidia-390 for lowlatency${variant:suffix} Install extra signed nvidia-390 modules compatible with lowlatency${variant:suffix} @@ -53,7 +57,8 @@ Section: kernel Provides: ${dkms:nvidia-435-modules} Depends: ${misc:Depends}, - linux-modules-nvidia-435-@ABI@-lowlatency (= ${binary:Version}) + 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 lowlatency${variant:suffix} @@ -65,7 +70,8 @@ Section: kernel Provides: ${dkms:nvidia-440-modules} Depends: ${misc:Depends}, - linux-modules-nvidia-440-@ABI@-lowlatency (= ${binary:Version}) + linux-modules-nvidia-440-@ABI@-lowlatency (= ${binary:Version}), + ${nvk:nvidia-440} Description: Extra drivers for nvidia-440 for lowlatency${variant:suffix} Install extra signed nvidia-440 modules compatible with lowlatency${variant:suffix} From patchwork Mon Jul 20 14:32: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: 1332456 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 4B9PNV1L8tz9sTV; Tue, 21 Jul 2020 00:33:30 +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 1jxWr8-0003EH-SY; Mon, 20 Jul 2020 14:33:26 +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 1jxWr7-0003Dm-8t for kernel-team@lists.ubuntu.com; Mon, 20 Jul 2020 14:33:25 +0000 Received: from mail-wr1-f70.google.com ([209.85.221.70]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jxWr7-0003UE-1t for kernel-team@lists.ubuntu.com; Mon, 20 Jul 2020 14:33:25 +0000 Received: by mail-wr1-f70.google.com with SMTP id o12so12192692wrj.23 for ; Mon, 20 Jul 2020 07:33:25 -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=oztOJC3OCr84LE2XNJ80Uuiuj+aiaaAMdCZ5ogtkIZI=; b=WJq8P4M9ByAyXS92QkJnzrc9yi1Kha0xTk0NwcBxqoGRx+V2a4OkMgi7Z0FoZ5hmgD 8/gtQ6ZoUvIlND1nXuIdD57UGK3cs4YGQhQYrbOFqJkIIZtuX3Od3hPFP37Iug5hA4KI OzQa/yM4rVOAyea1mF+6gQwEr2UJF801LzrLZZCqjh8yaVbtTiKzUdwEameqRwoh4UCT 4u1DVDLhDh/yHA4/X4h/1SgFkdVx3h4CaZIaNIO79H3x9Hr3DohFfUvZ1IipHUQ3K1E1 7iNmjABFSawktK6c/wLsV4v2mxLOGA6clAEDcCrf0VOlzSarDT7/uZPs0dFhLkU338yX /aHw== X-Gm-Message-State: AOAM5337cBxQ4phstZch+pST9OyjBv9EBLH80fkpgO42hqxHXOjcedjl 21FbauWFFpQ/knZraCDLL+B+bLuwnUoTv0e+4NeNx0hbeuBDeKKOEpyWZ+9TCN8DstlkIlCKVA4 ci5bhE/q3TRMYtdvunVUOz9Dxb+u+sejzlO8/Jmd6PQ== X-Received: by 2002:adf:f488:: with SMTP id l8mr8127033wro.123.1595255604049; Mon, 20 Jul 2020 07:33:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzAiZSSuNsQBwSe1hTpIeKpIB1f8YOyJajfkLlRS1dZoMfy37MNagcyaZ+A0EIhw5M2OMZ43w== X-Received: by 2002:adf:f488:: with SMTP id l8mr8127019wro.123.1595255603827; Mon, 20 Jul 2020 07:33:23 -0700 (PDT) Received: from thinkpad.lan (dynamic-adsl-94-34-33-205.clienti.tiscali.it. [94.34.33.205]) by smtp.gmail.com with ESMTPSA id k126sm35120885wme.17.2020.07.20.07.33.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2020 07:33:23 -0700 (PDT) From: Alberto Milone To: kernel-team@lists.ubuntu.com Subject: [PATCH V2 3/5 G][L-R-M] UBUNTU: [packaging] drop nvidia-kernel-common dependency from the ABI metas Date: Mon, 20 Jul 2020 16:32:52 +0200 Message-Id: <20200720143254.4136051-4-alberto.milone@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200720143254.4136051-1-alberto.milone@canonical.com> References: <20200720143254.4136051-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" This drops the dependency on nvidia-kernel-common from the ABI meta packages, since the dependency is already expressed by the main meta packages. BugLink: https://bugs.launchpad.net/bugs/1881137 Signed-off-by: Alberto Milone --- debian/control.d/nvidia | 6 ------ 1 file changed, 6 deletions(-) diff --git a/debian/control.d/nvidia b/debian/control.d/nvidia index c99ab02..7284bfb 100644 --- a/debian/control.d/nvidia +++ b/debian/control.d/nvidia @@ -9,7 +9,6 @@ Depends: ${shlibs:Depends}, binutils, linux-image-@ABI@-generic | linux-image-unsigned-@ABI@-generic, - nvidia-kernel-common-390, Description: Linux kernel nvidia modules for version @ABI@ This package contains the Linux kernel nvidia modules for version @ABI@. . @@ -29,7 +28,6 @@ Depends: ${shlibs:Depends}, binutils, linux-image-@ABI@-generic | linux-image-unsigned-@ABI@-generic, - nvidia-kernel-common-435, Description: Linux kernel nvidia modules for version @ABI@ This package contains the Linux kernel nvidia modules for version @ABI@. . @@ -49,7 +47,6 @@ 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@. . @@ -69,7 +66,6 @@ Depends: ${shlibs:Depends}, binutils, linux-image-@ABI@-lowlatency | linux-image-unsigned-@ABI@-lowlatency, - nvidia-kernel-common-390, Description: Linux kernel nvidia modules for version @ABI@ This package contains the Linux kernel nvidia modules for version @ABI@. . @@ -89,7 +85,6 @@ Depends: ${shlibs:Depends}, binutils, linux-image-@ABI@-lowlatency | linux-image-unsigned-@ABI@-lowlatency, - nvidia-kernel-common-435, Description: Linux kernel nvidia modules for version @ABI@ This package contains the Linux kernel nvidia modules for version @ABI@. . @@ -109,7 +104,6 @@ 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@. . From patchwork Mon Jul 20 14:32: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: 1332457 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 4B9PNf3zjYz9sTg; Tue, 21 Jul 2020 00:33:38 +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 1jxWrH-0003Ik-43; Mon, 20 Jul 2020 14:33:35 +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 1jxWrE-0003HN-K6 for kernel-team@lists.ubuntu.com; Mon, 20 Jul 2020 14:33:32 +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 1jxWrE-0003Ux-Bo for kernel-team@lists.ubuntu.com; Mon, 20 Jul 2020 14:33:32 +0000 Received: by mail-wm1-f70.google.com with SMTP id e15so14244649wme.8 for ; Mon, 20 Jul 2020 07:33:32 -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=+C3qqNJ+wbDD+AJVnb7CXQJ+YsYg6R2kQImkc3TJqDw=; b=SnQj/yWydk7sLvXsaBOnT38yvvCuMv7ZhGSbfXdhqxz3NtscKnyVpt63fhrZdX390a ZBTNAVXtSEpd1HOQRw7zGP5+IB5BHwakYxhvU0Vtsif1b4ur38GmQfHRve29u+jMMcn3 l1aV55xMoFQIJQPmIvz3JRsUADis6kfSqYDHapnWV0uohC9X37Ma6xwmtNUkFxm5wpEc GbJLetTmLApIY3RTfVqQ6lxx7nAFyjE80CFo2kIHs0q7Mci0NtgpH2ghs1GtCIYtDdlU gsntlsq3bO0bTb+M0p6gJ7fXvLVtlInLa26gnHwf05w7NO1jStiTsO6M9+ua8pTBhnJO A6DQ== X-Gm-Message-State: AOAM5321eR+XQurkWhNkm9iSqDZJCOvjzLusOcApbzlQ3CS+3YTAVxZw 69lrlMr6A/BVUc0EHH8USCLF79fDW4P0cB+FNNXLNY7rkbaAJcDbFEHZPTGsJtQFDoRxKq3Pdyd qSmGxM+PanelZtiprYXOfXpjHk5zxnPRGemMhGddTnQ== X-Received: by 2002:a1c:18e:: with SMTP id 136mr21275683wmb.93.1595255611441; Mon, 20 Jul 2020 07:33:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxIKIoYcNfJHs64EMwJE8E5qTfYMbhKBkf22zdbbPACKmWDJoRONtepK5dmlGk4wTdf9KCWSw== X-Received: by 2002:a1c:18e:: with SMTP id 136mr21275652wmb.93.1595255611018; Mon, 20 Jul 2020 07:33:31 -0700 (PDT) Received: from thinkpad.lan (dynamic-adsl-94-34-33-205.clienti.tiscali.it. [94.34.33.205]) by smtp.gmail.com with ESMTPSA id k126sm35120885wme.17.2020.07.20.07.33.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2020 07:33:29 -0700 (PDT) From: Alberto Milone To: kernel-team@lists.ubuntu.com Subject: [PATCH V2 4/5 G][L-R-M] UBUNTU: [packaging] add nvidia 418-server and 440-server drivers Date: Mon, 20 Jul 2020 16:32:53 +0200 Message-Id: <20200720143254.4136051-5-alberto.milone@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200720143254.4136051-1-alberto.milone@canonical.com> References: <20200720143254.4136051-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" BugLink: https://bugs.launchpad.net/bugs/1881137 Signed-off-by: Alberto Milone --- debian/control.d/meta-nvidia | 48 +++++++++++++++++++++++ debian/control.d/nvidia | 76 ++++++++++++++++++++++++++++++++++++ debian/dkms-versions | 4 +- debian/rules | 24 ++++++++++-- 4 files changed, 148 insertions(+), 4 deletions(-) diff --git a/debian/control.d/meta-nvidia b/debian/control.d/meta-nvidia index f3f1ba2..71d3c69 100644 --- a/debian/control.d/meta-nvidia +++ b/debian/control.d/meta-nvidia @@ -37,6 +37,32 @@ Description: Extra drivers for nvidia-440 for generic${variant:suffix} Install extra signed nvidia-440 modules compatible with generic${variant:suffix} +Package: linux-modules-nvidia-418-server-generic${variant:suffix} +Build-Profiles: +Architecture: amd64 +Section: kernel +Provides: ${dkms:nvidia-418-server-modules} +Depends: + ${misc:Depends}, + linux-modules-nvidia-418-server-@ABI@-generic (= ${binary:Version}), + ${nvk:nvidia-418-server} +Description: Extra drivers for nvidia-418-server for generic${variant:suffix} + Install extra signed nvidia-418-server modules compatible with + generic${variant:suffix} + +Package: linux-modules-nvidia-440-server-generic${variant:suffix} +Build-Profiles: +Architecture: amd64 +Section: kernel +Provides: ${dkms:nvidia-440-server-modules} +Depends: + ${misc:Depends}, + linux-modules-nvidia-440-server-@ABI@-generic (= ${binary:Version}), + ${nvk:nvidia-440-server} +Description: Extra drivers for nvidia-440-server for generic${variant:suffix} + Install extra signed nvidia-440-server modules compatible with + generic${variant:suffix} + Package: linux-modules-nvidia-390-lowlatency${variant:suffix} Build-Profiles: Architecture: amd64 @@ -75,3 +101,25 @@ Depends: Description: Extra drivers for nvidia-440 for lowlatency${variant:suffix} Install extra signed nvidia-440 modules compatible with lowlatency${variant:suffix} + +Package: linux-modules-nvidia-418-server-lowlatency${variant:suffix} +Build-Profiles: +Architecture: amd64 +Section: kernel +Provides: ${dkms:nvidia-418-server-modules} +Depends: ${misc:Depends}, + linux-modules-nvidia-418-server-ABI-lowlatency (= ${binary:Version}), + ${nvk:nvidia-418-server} +Description: Extra drivers for nvidia-418-server for the lowlatency flavour + Install extra signed nvidia-418-server modules compatible with the lowlatency flavour. + +Package: linux-modules-nvidia-440-server-lowlatency${variant:suffix} +Build-Profiles: +Architecture: amd64 +Section: kernel +Provides: ${dkms:nvidia-440-server-modules} +Depends: ${misc:Depends}, + linux-modules-nvidia-440-server-ABI-lowlatency (= ${binary:Version}), + ${nvk:nvidia-440-server} +Description: Extra drivers for nvidia-440-server for the lowlatency flavour + Install extra signed nvidia-440-server modules compatible with the lowlatency flavour. diff --git a/debian/control.d/nvidia b/debian/control.d/nvidia index 7284bfb..c2a012d 100644 --- a/debian/control.d/nvidia +++ b/debian/control.d/nvidia @@ -55,6 +55,44 @@ 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-418-server-@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, +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-418-server-generic* meta-packages, + which will ensure that upgrades work correctly, and that supporting packages are + also installed. + +Package: linux-modules-nvidia-440-server-@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, +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-server-generic* meta-packages, + which will ensure that upgrades work correctly, and that supporting packages are + also installed. + Package: linux-modules-nvidia-390-@ABI@-lowlatency Build-Profiles: Architecture: amd64 @@ -111,3 +149,41 @@ Description: Linux kernel nvidia modules for version @ABI@ one of the linux-modules-nvidia-440-lowlatency* meta-packages, which will ensure that upgrades work correctly, and that supporting packages are also installed. + +Package: linux-modules-nvidia-418-server-@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, +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-418-server-lowlatency* meta-packages, + which will ensure that upgrades work correctly, and that supporting packages are + also installed. + +Package: linux-modules-nvidia-440-server-@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, +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-server-lowlatency* meta-packages, + which will ensure that upgrades work correctly, and that supporting packages are + also installed. diff --git a/debian/dkms-versions b/debian/dkms-versions index 0d82eff..a1fe99b 100644 --- a/debian/dkms-versions +++ b/debian/dkms-versions @@ -1,4 +1,6 @@ zfs-linux 0.8.4-1ubuntu8 nvidia-graphics-drivers-390 390.138-0ubuntu2 nvidia-graphics-drivers-435 435.21-0ubuntu8 -nvidia-graphics-drivers-440 440.100-0ubuntu1 +nvidia-graphics-drivers-440 0 +nvidia-graphics-drivers-418-server 0 +nvidia-graphics-drivers-440-server 0 diff --git a/debian/rules b/debian/rules index 2dccec5..3940bbf 100755 --- a/debian/rules +++ b/debian/rules @@ -13,13 +13,17 @@ src_version = $(shell echo $(src_fullversion) | sed -e 's/+[0-9][0-9]*//') src_series = $(shell dpkg-parsechangelog -SDistribution | sed -e 's/-\(security\|updates\|proposed\)$$//') 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_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_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) 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_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) # Get variants, assuming primary if debian/variants is not present variants = -- @@ -144,6 +148,16 @@ nvidia-%: $(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-418-server-$(src_abi)-$* + install -d debian/linux-modules-nvidia-418-server-$(src_abi)-$*/usr/lib/linux/triggers + $(call build_dkms, $(src_abi)-$*, linux-modules-nvidia-418-server-$(src_abi)-$*, $(CURDIR)/debian/linux-modules-nvidia-418-server-$(src_abi)-$*/lib/modules/$(src_abi)-$*/kernel, "", nvidia-418srv, pool/restricted/n/nvidia-graphics-drivers-418-server/nvidia-kernel-source-418-server_$(dkms_nvidia_418_server_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-418-server/nvidia-dkms-418-server_$(dkms_nvidia_418_server_version)_$(arch).deb) + $(call install_control,linux-modules-nvidia-418-server-$(src_abi)-$*,$*,nvidia,418srv,postinst postrm prerm config templates) + + install -d debian/linux-modules-nvidia-440-server-$(src_abi)-$* + install -d debian/linux-modules-nvidia-440-server-$(src_abi)-$*/usr/lib/linux/triggers + $(call build_dkms, $(src_abi)-$*, linux-modules-nvidia-440-server-$(src_abi)-$*, $(CURDIR)/debian/linux-modules-nvidia-440-server-$(src_abi)-$*/lib/modules/$(src_abi)-$*/kernel, "", nvidia-440srv, pool/restricted/n/nvidia-graphics-drivers-440-server/nvidia-kernel-source-440-server_$(dkms_nvidia_440_server_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-440-server/nvidia-dkms-440-server_$(dkms_nvidia_440_server_version)_$(arch).deb) + $(call install_control,linux-modules-nvidia-440-server-$(src_abi)-$*,$*,nvidia,440srv,postinst postrm prerm config templates) + prepare-dkms: mkdir -p $(dkms_dir) ln -s /usr/src $(dkms_dir)/headers @@ -158,10 +172,14 @@ 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-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 += -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-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))" override_dh_gencontrol: dh_gencontrol -- $(gencontrol_flags) From patchwork Mon Jul 20 14:32:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Milone X-Patchwork-Id: 1332458 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 4B9PNn6Pdkz9sTr; Tue, 21 Jul 2020 00:33:45 +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 1jxWrO-0003M3-EA; Mon, 20 Jul 2020 14:33:42 +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 1jxWrL-0003LA-S0 for kernel-team@lists.ubuntu.com; Mon, 20 Jul 2020 14:33:39 +0000 Received: from mail-wm1-f71.google.com ([209.85.128.71]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jxWrL-0003Vn-Ku for kernel-team@lists.ubuntu.com; Mon, 20 Jul 2020 14:33:39 +0000 Received: by mail-wm1-f71.google.com with SMTP id v6so12569127wmg.1 for ; Mon, 20 Jul 2020 07:33:39 -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=YsoMcukWCp0vXYfQ1w3kgQvxEISQjjDolN/Ojfkfcyc=; b=dggo8Nerv5qpM8RhTY0tIT1594pnlc769YPlQb8M9HI48iCGB2hSHHP/EvgWXbK9oo dx5hK4WM82cbyNURYBUuc9n+MEEK4+EbEAleUkE9HJWkv1sdXYBWR5x+3WrkHNVTq4YX j4/pOZkE6TEjeaPZGi/klUdN8/SdzKFiOXzCOUZWBHhkiqbZrkF45y+WsB7if3fsQDed ejc+f2uvEtPZ7FZZwbUHP84iEOOYCSvjOGeoPEEzp+YGviffYnbBnrkAtGUZn7iitRgE NMipQsAK0yAlLII0iYM1azBsXLCzROlg7wxzU20LnWnUBRPrbCZI5kE8wTDtaYh5azB8 Ox4A== X-Gm-Message-State: AOAM532kBq7dPJgQqUHz2FJwDLsjTftYvnSzIIjH5sCOAntNHmBG0zu8 2OhNdUbgeL96qA9N3ILsfjXsD5EZr5RXkvHQ9oXAxAQ81+yUmVXo3NZ2UaxbTW0hQNerf9kuJ6k fBT96E8bDIz2NKPFO4G8fGLLdCF4jtlIcqqzG/lJQAw== X-Received: by 2002:adf:f64a:: with SMTP id x10mr13724661wrp.99.1595255618715; Mon, 20 Jul 2020 07:33:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw7X7tMuH8/ui1ntMCcAf1WAa06cSr0CCcXvMhLYYxTjDV1BIje6E4wJ7tRxTtniLk+vlTAag== X-Received: by 2002:adf:f64a:: with SMTP id x10mr13724633wrp.99.1595255618228; Mon, 20 Jul 2020 07:33:38 -0700 (PDT) Received: from thinkpad.lan (dynamic-adsl-94-34-33-205.clienti.tiscali.it. [94.34.33.205]) by smtp.gmail.com with ESMTPSA id k126sm35120885wme.17.2020.07.20.07.33.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2020 07:33:37 -0700 (PDT) From: Alberto Milone To: kernel-team@lists.ubuntu.com Subject: [PATCH V2 5/5 G][L-R-M] UBUNTU: [packaging] add nvidia 450 and 450-server Date: Mon, 20 Jul 2020 16:32:54 +0200 Message-Id: <20200720143254.4136051-6-alberto.milone@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200720143254.4136051-1-alberto.milone@canonical.com> References: <20200720143254.4136051-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 new nvidia 450 replaces the 440 series, whereas the -server flavours only get the additional 450-server (keeping 440-server). BugLink: https://bugs.launchpad.net/bugs/1887674 Signed-off-by: Alberto Milone --- debian/control.d/meta-nvidia | 47 +++++++++++++++++------ debian/control.d/nvidia | 46 ++++++++++++++++++++-- debian/control.d/transitionals-nvidia-440 | 13 +++++++ debian/dkms-versions | 3 +- debian/rules | 25 ++++++++---- 5 files changed, 109 insertions(+), 25 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 71d3c69..3f9b4d0 100644 --- a/debian/control.d/meta-nvidia +++ b/debian/control.d/meta-nvidia @@ -24,17 +24,17 @@ Description: Extra drivers for nvidia-435 for generic${variant:suffix} Install extra signed nvidia-435 modules compatible with generic${variant:suffix} -Package: linux-modules-nvidia-440-generic${variant:suffix} +Package: linux-modules-nvidia-450-generic${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@-generic (= ${binary:Version}), - ${nvk:nvidia-440} -Description: Extra drivers for nvidia-440 for generic${variant:suffix} - Install extra signed nvidia-440 modules compatible with + linux-modules-nvidia-450-@ABI@-generic (= ${binary:Version}), + ${nvk:nvidia-450} +Description: Extra drivers for nvidia-450 for generic${variant:suffix} + Install extra signed nvidia-450 modules compatible with generic${variant:suffix} Package: linux-modules-nvidia-418-server-generic${variant:suffix} @@ -63,6 +63,19 @@ Description: Extra drivers for nvidia-440-server for generic${variant:suffix} Install extra signed nvidia-440-server modules compatible with generic${variant:suffix} +Package: linux-modules-nvidia-450-server-generic${variant:suffix} +Build-Profiles: +Architecture: amd64 +Section: kernel +Provides: ${dkms:nvidia-450-server-modules} +Depends: + ${misc:Depends}, + linux-modules-nvidia-450-server-@ABI@-generic (= ${binary:Version}), + ${nvk:nvidia-450-server} +Description: Extra drivers for nvidia-450-server for generic${variant:suffix} + Install extra signed nvidia-450-server modules compatible with + generic${variant:suffix} + Package: linux-modules-nvidia-390-lowlatency${variant:suffix} Build-Profiles: Architecture: amd64 @@ -89,17 +102,17 @@ Description: Extra drivers for nvidia-435 for lowlatency${variant:suffix} Install extra signed nvidia-435 modules compatible with lowlatency${variant:suffix} -Package: linux-modules-nvidia-440-lowlatency${variant:suffix} +Package: linux-modules-nvidia-450-lowlatency${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@-lowlatency (= ${binary:Version}), - ${nvk:nvidia-440} -Description: Extra drivers for nvidia-440 for lowlatency${variant:suffix} - Install extra signed nvidia-440 modules compatible with + linux-modules-nvidia-450-@ABI@-lowlatency (= ${binary:Version}), + ${nvk:nvidia-450} +Description: Extra drivers for nvidia-450 for lowlatency${variant:suffix} + Install extra signed nvidia-450 modules compatible with lowlatency${variant:suffix} Package: linux-modules-nvidia-418-server-lowlatency${variant:suffix} @@ -123,3 +136,13 @@ Depends: ${misc:Depends}, ${nvk:nvidia-440-server} Description: Extra drivers for nvidia-440-server for the lowlatency flavour Install extra signed nvidia-440-server modules compatible with the lowlatency flavour. + +Package: linux-modules-nvidia-450-server-lowlatency${variant:suffix} +Build-Profiles: +Architecture: amd64 +Section: kernel +Provides: ${dkms:nvidia-450-server-modules} +Depends: ${misc:Depends}, linux-modules-nvidia-450-server-ABI-lowlatency (= ${binary:Version}), + ${nvk:nvidia-450-server} +Description: Extra drivers for nvidia-450-server for the lowlatency flavour + Install extra signed nvidia-450-server modules compatible with the lowlatency flavour. diff --git a/debian/control.d/nvidia b/debian/control.d/nvidia index c2a012d..383c55d 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@-generic +Package: linux-modules-nvidia-450-@ABI@-generic Build-Profiles: Architecture: amd64 Section: kernel @@ -51,7 +51,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-generic* meta-packages, + one of the linux-modules-nvidia-450-generic* meta-packages, which will ensure that upgrades work correctly, and that supporting packages are also installed. @@ -93,6 +93,25 @@ 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-450-server-@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, +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-450-server-generic* meta-packages, + which will ensure that upgrades work correctly, and that supporting packages are + also installed. + Package: linux-modules-nvidia-390-@ABI@-lowlatency Build-Profiles: Architecture: amd64 @@ -131,7 +150,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@-lowlatency +Package: linux-modules-nvidia-450-@ABI@-lowlatency Build-Profiles: Architecture: amd64 Section: kernel @@ -146,7 +165,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-lowlatency* meta-packages, + one of the linux-modules-nvidia-450-lowlatency* meta-packages, which will ensure that upgrades work correctly, and that supporting packages are also installed. @@ -187,3 +206,22 @@ Description: Linux kernel nvidia modules for version @ABI@ one of the linux-modules-nvidia-440-server-lowlatency* meta-packages, which will ensure that upgrades work correctly, and that supporting packages are also installed. + +Package: linux-modules-nvidia-450-server-@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, +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-450-server-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-440 b/debian/control.d/transitionals-nvidia-440 new file mode 100644 index 0000000..987ecad --- /dev/null +++ b/debian/control.d/transitionals-nvidia-440 @@ -0,0 +1,13 @@ +Package: linux-modules-nvidia-440-generic +Architecture: amd64 +Section: oldlibs +Depends: linux-modules-nvidia-450-generic +Description: Extra drivers for nvidia-440 for the generic flavour (dummy transitional package) + Transitional package for upgrades of -440 to -450. + +Package: linux-modules-nvidia-440-lowlatency +Architecture: amd64 +Section: oldlibs +Depends: linux-modules-nvidia-450-lowlatency +Description: Extra drivers for nvidia-440 for the generic flavour (dummy transitional package) + Transitional package for upgrades of -440 to -450. diff --git a/debian/dkms-versions b/debian/dkms-versions index a1fe99b..9647ba1 100644 --- a/debian/dkms-versions +++ b/debian/dkms-versions @@ -1,6 +1,7 @@ zfs-linux 0.8.4-1ubuntu8 nvidia-graphics-drivers-390 390.138-0ubuntu2 nvidia-graphics-drivers-435 435.21-0ubuntu8 -nvidia-graphics-drivers-440 0 +nvidia-graphics-drivers-450 0 nvidia-graphics-drivers-418-server 0 nvidia-graphics-drivers-440-server 0 +nvidia-graphics-drivers-450-server 0 diff --git a/debian/rules b/debian/rules index 3940bbf..91dcab6 100755 --- a/debian/rules +++ b/debian/rules @@ -15,15 +15,17 @@ 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) 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_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) 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) +nvidia_450_server_upstream_version=$(shell echo "$(dkms_nvidia_450_server_version)" | cut -d '-' -f 1) # Get variants, assuming primary if debian/variants is not present variants = -- @@ -143,10 +145,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) install -d debian/linux-modules-nvidia-418-server-$(src_abi)-$* install -d debian/linux-modules-nvidia-418-server-$(src_abi)-$*/usr/lib/linux/triggers @@ -158,6 +160,11 @@ nvidia-%: $(call build_dkms, $(src_abi)-$*, linux-modules-nvidia-440-server-$(src_abi)-$*, $(CURDIR)/debian/linux-modules-nvidia-440-server-$(src_abi)-$*/lib/modules/$(src_abi)-$*/kernel, "", nvidia-440srv, pool/restricted/n/nvidia-graphics-drivers-440-server/nvidia-kernel-source-440-server_$(dkms_nvidia_440_server_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-440-server/nvidia-dkms-440-server_$(dkms_nvidia_440_server_version)_$(arch).deb) $(call install_control,linux-modules-nvidia-440-server-$(src_abi)-$*,$*,nvidia,440srv,postinst postrm prerm config templates) + install -d debian/linux-modules-nvidia-450-server-$(src_abi)-$* + install -d debian/linux-modules-nvidia-450-server-$(src_abi)-$*/usr/lib/linux/triggers + $(call build_dkms, $(src_abi)-$*, linux-modules-nvidia-450-server-$(src_abi)-$*, $(CURDIR)/debian/linux-modules-nvidia-450-server-$(src_abi)-$*/lib/modules/$(src_abi)-$*/kernel, "", nvidia-450srv, pool/restricted/n/nvidia-graphics-drivers-450-server/nvidia-kernel-source-450-server_$(dkms_nvidia_450_server_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-450-server/nvidia-dkms-450-server_$(dkms_nvidia_450_server_version)_$(arch).deb) + $(call install_control,linux-modules-nvidia-450-server-$(src_abi)-$*,$*,nvidia,450srv,postinst postrm prerm config templates) + prepare-dkms: mkdir -p $(dkms_dir) ln -s /usr/src $(dkms_dir)/headers @@ -171,15 +178,17 @@ 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 += -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-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))" 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))" +gencontrol_flags += -Vnvk:nvidia-450-server="nvidia-kernel-common-450-server (<= $(nvidia_450_server_upstream_version)-1), nvidia-kernel-common-450-server (>= $(nvidia_450_server_upstream_version))" override_dh_gencontrol: dh_gencontrol -- $(gencontrol_flags)