From patchwork Fri Mar 13 15:29:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Milone X-Patchwork-Id: 1254467 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 48f8kY1VXDz9sRN; Sat, 14 Mar 2020 02:29:25 +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 1jCmFW-0003Jf-8q; Fri, 13 Mar 2020 15:29:22 +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 1jCmFU-0003JF-9O for kernel-team@lists.ubuntu.com; Fri, 13 Mar 2020 15:29:20 +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 1jCmFT-0000lw-Vt for kernel-team@lists.ubuntu.com; Fri, 13 Mar 2020 15:29:20 +0000 Received: by mail-wm1-f70.google.com with SMTP id n188so3627880wmf.0 for ; Fri, 13 Mar 2020 08:29:19 -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=z2iwST/Jo7VZuxGYqhW4lL5AUKhMkD3Sl+wJa0E3Iao=; b=G21gW+RqrBkGn4/xjSMA8vRd2EwhsybMiseIBwo9WJmhtN593vUz+7jXwmozcWjpCW 0Jwzj85No2/5vgSToBbl4y0seRtLV9mjk7pVFb0mVq0Db5PYRHcE4pA9chDE9P2DMdXN sRiBZu1yPxPh0TvDkj8DTrTNi86K1NvlnfyX85bqwbooH1A5wAGhbIlRLaCmRej9lFNJ vLJHlqGkkzq57uA5xNuPILP1DogV2kcsSHw4ZX+qr64kCBd0AyD+hMfoHriMR0GC7hTm 8Z90K2O4C4pAe6Z2F+IxYvIXggqXDiuYBbz+dYB2H3CFSMvTSMbxAtfVZ8IgzduYuUjV gJUQ== X-Gm-Message-State: ANhLgQ18lCMvX3HSwZJx3h8xRgfA0Ugru5gCslFW76SNBhWExgDemcER YBzdpMwcMaH0D7vFOjIVq0qPSKl5/v4U5+T7GJIemcTAAT3MxCK4DF0L5tHIUrMIYK25KjOnak9 f0tebsZ9sI2neJIYRNqxnfrxZ0B5MmPDDSj3yEnrnXQ== X-Received: by 2002:a1c:1fc9:: with SMTP id f192mr11746524wmf.4.1584113359447; Fri, 13 Mar 2020 08:29:19 -0700 (PDT) X-Google-Smtp-Source: ADFU+vsdfpB8WdSfljHWj3Z5DNqyBhHZ4sv2xp8RcZuugIq/ayzS31CnwA3xXciLzPkotit69r4xJQ== X-Received: by 2002:a1c:1fc9:: with SMTP id f192mr11746499wmf.4.1584113359207; Fri, 13 Mar 2020 08:29:19 -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 u8sm33610358wrn.69.2020.03.13.08.29.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Mar 2020 08:29:18 -0700 (PDT) From: Alberto Milone To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/2 B][SRU][linux]UBUNTU: [Packaging] NVIDIA -- add support for the 435 and the 440 series Date: Fri, 13 Mar 2020 16:29:02 +0100 Message-Id: <20200313152903.31143-2-alberto.milone@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200313152903.31143-1-alberto.milone@canonical.com> References: <20200313152903.31143-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/1854485 Signed-off-by: Alberto Milone --- debian/dkms-versions | 2 ++ debian/rules | 4 +++- debian/rules.d/2-binary-arch.mk | 4 +++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/dkms-versions b/debian/dkms-versions index 274a3bbd3841..44e43c1ae99c 100644 --- a/debian/dkms-versions +++ b/debian/dkms-versions @@ -1,3 +1,5 @@ spl-linux 0.7.5-1ubuntu2 zfs-linux 0.7.5-1ubuntu16.7 nvidia-graphics-drivers-390 390.116-0ubuntu0.18.04.3 +nvidia-graphics-drivers-435 0 +nvidia-graphics-drivers-440 0 diff --git a/debian/rules b/debian/rules index 4a4707637867..f732ba6f698d 100755 --- a/debian/rules +++ b/debian/rules @@ -105,7 +105,9 @@ endif # Versions of dkms packages. dkms_zfs_linux_version=$(shell gawk '/^zfs-linux / { print $$2; }' debian/dkms-versions) dkms_spl_linux_version=$(shell gawk '/^spl-linux / { print $$2; }' debian/dkms-versions) -dkms_nvidia_version=$(shell gawk '/^nvidia-graphics-drivers-/ { 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) # Debian Build System targets binary: binary-indep binary-arch diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 2485a175ce52..0e2b48d4ce5b 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -402,7 +402,9 @@ endif $(if $(filter true,$(enable_zfs)),$(call build_dkms, $(mods_pkg_name)-$*, $(pkgdir)/lib/modules/$(abi_release)-$*/kernel, zfs, pool/universe/z/zfs-linux/zfs-dkms_$(dkms_zfs_linux_version)_all.deb)) ifeq ($(do_dkms_nvidia),true) - $(call build_dkms, $(bldinfo_pkg_name)-$*, $(pkgdir_bldinfo)/usr/lib/linux/$(abi_release)-$*/signatures, nvidia-390, pool/restricted/n/nvidia-graphics-drivers-390/nvidia-kernel-source-390_$(dkms_nvidia_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-390/nvidia-dkms-390_$(dkms_nvidia_version)_$(arch).deb) + $(call build_dkms, $(bldinfo_pkg_name)-$*, $(pkgdir_bldinfo)/usr/lib/linux/$(abi_release)-$*/signatures, 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 build_dkms, $(bldinfo_pkg_name)-$*, $(pkgdir_bldinfo)/usr/lib/linux/$(abi_release)-$*/signatures, 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 build_dkms, $(bldinfo_pkg_name)-$*, $(pkgdir_bldinfo)/usr/lib/linux/$(abi_release)-$*/signatures, 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) endif # Build the final ABI information.