From patchwork Mon Feb 24 15:58:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Milone X-Patchwork-Id: 1243297 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 48R6DY3Xr8z9sRQ; Tue, 25 Feb 2020 02:58:37 +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 1j6G7u-00072O-Aw; Mon, 24 Feb 2020 15:58:34 +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 1j6G7o-00072I-Mg for kernel-team@lists.ubuntu.com; Mon, 24 Feb 2020 15:58:28 +0000 Received: from mail-wm1-f69.google.com ([209.85.128.69]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1j6G7o-0007Kw-F4 for kernel-team@lists.ubuntu.com; Mon, 24 Feb 2020 15:58:28 +0000 Received: by mail-wm1-f69.google.com with SMTP id b205so2548666wmh.2 for ; Mon, 24 Feb 2020 07:58:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=RYyxXQQz+/Vd5CvZ2ZI2zG6IsjZMQlrZUm1QspAl5y8=; b=oxsr80h4ld1lQUaCqESmyM6XbREetw8Jtn5lEN/m9rJVfMC4aFK8tLGF4oRmRRyGpb RFEyytiIWcahkR7Chqtz5zB7uRkZDveOg3jiS7cy98zUkJcUopGh4eRQ0IZum1oCaE/Q hAs9YEbKvbxK3249n16nEEpfHQHo54egT/I8b90gWbGlPqJHlune8YeDjl5YcCBoxoVZ rnetQrLRkNKBA/c2byKyMK/XRI0zPmxZXkfr9pvHHrpUcC0/pmA0e1kOjXhXQyPfJrf5 QgRSUHYXasQCQW9Nfs9fVRAsdtHxZbsTpHRc0eO2NClr7nae2vrl7riQKt46izKRR9tz jqTw== X-Gm-Message-State: APjAAAV6D6ggdmstGF/iQG/L0DcQ+ZXMzNB2VWxQ2nijwTxMwWM6earA cxeYF01Bn4mzPAKUFKGnWjKPgUdbmHCdguoVVFGIkW6NbUacVeFFT80DQp9x1+13M6ZWnDz7Yp9 IJ88sjPChjGOzP7pIbHHzaw9Vj/sn6cFEdSZG8OcT6w== X-Received: by 2002:a5d:6144:: with SMTP id y4mr66065350wrt.367.1582559907912; Mon, 24 Feb 2020 07:58:27 -0800 (PST) X-Google-Smtp-Source: APXvYqzXRQT88fKhUX4k7GFyp8ulLuwu1X8eL9/BTMI/NMhCZ7NlacDL20FLDvX08JU/sFxoU41wQA== X-Received: by 2002:a5d:6144:: with SMTP id y4mr66065329wrt.367.1582559907615; Mon, 24 Feb 2020 07:58:27 -0800 (PST) Received: from canonical.com (net-93-147-105-79.cust.vodafonedsl.it. [93.147.105.79]) by smtp.gmail.com with ESMTPSA id a22sm19285015wmd.20.2020.02.24.07.58.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2020 07:58:26 -0800 (PST) From: alberto.milone@canonical.com To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/1] UBUNTU: [Packaging] NVIDIA -- add support for the 435 and the 440 series Date: Mon, 24 Feb 2020 16:58:23 +0100 Message-Id: <20200224155823.3167-1-alberto.milone@canonical.com> X-Mailer: git-send-email 2.20.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" From: Alberto Milone BugLink: https://bugs.launchpad.net/bugs/1854485 Signed-off-by: Alberto Milone Acked-by: Kleber Sacilotto de Souza --- 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.