From patchwork Tue Dec 17 16:18:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 1211553 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 47ck5L4yWRz9sRX; Wed, 18 Dec 2019 03:25:26 +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 1ihFf0-0001uk-UR; Tue, 17 Dec 2019 16:25: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 1ihFey-0001ub-92 for kernel-team@lists.ubuntu.com; Tue, 17 Dec 2019 16:25:20 +0000 Received: from mail-yb1-f198.google.com ([209.85.219.198]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1ihFex-00048w-TU for kernel-team@lists.ubuntu.com; Tue, 17 Dec 2019 16:25:20 +0000 Received: by mail-yb1-f198.google.com with SMTP id e11so9548096ybn.12 for ; Tue, 17 Dec 2019 08:25:19 -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:in-reply-to :references:mime-version:content-transfer-encoding; bh=KoUiXjvHpmMPFKkpXnSUvlXu9Lu1tedBmlN+ygojTE8=; b=sorkVRKUGEjiaHbHnOyPbylbDd491PCQqKmN2zG2R1PvqnPkniLxJrurrGc1MgPwPw UczsvQUx1r4KCRMiDotSgBwvbH1xyeLolHrX2JWr0zsJJa89OHeM/XsO6uataWJaRHZo QLIApFBynP2KWO2IQ/jsh9DcYsumeB2DlGAC2D3YAhbqwKr2P7h3vqACcAK3HQjAzsyv kOVe2mK3kUZwysKnhbS3T7J92L+YRFb50kwsH7O8g55S/JR3JehIvnnK/wht4iSvltIx QSQ0u5/9ny4zbI2UKJyNcmBScQGW0nwQji7XiUDEBBdwIqnbStc4KGj5vFl9vJ71XX6x x+Mw== X-Gm-Message-State: APjAAAXlt7mJ8W9mkjpHD2t5yN3GKKGriCJ22AgVPPjKUv5OVJYwkBm6 1GLVSm2HAAmYizOy52xGmBlmSu6BpNWT1KcEfEjTapl461kCazZ4mxziWjJnc6YUnnx8wc7jtdW rk9NgOltPeJ67xJ0UkQ1cA7kOJZJP7GHZM9364ldDNQ== X-Received: by 2002:a25:9206:: with SMTP id b6mr12807896ybo.377.1576599918742; Tue, 17 Dec 2019 08:25:18 -0800 (PST) X-Google-Smtp-Source: APXvYqzSEVlqtqRMWMoYxE3qqoiIcEXl+1K3xyQ680Q+TWWOHBXo1/YnQwqVOHACAs9gpj4irsNMGg== X-Received: by 2002:a25:9206:: with SMTP id b6mr12807876ybo.377.1576599918381; Tue, 17 Dec 2019 08:25:18 -0800 (PST) Received: from localhost ([136.37.150.243]) by smtp.gmail.com with ESMTPSA id a189sm2185821ywh.92.2019.12.17.08.25.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Dec 2019 08:25:17 -0800 (PST) From: Seth Forshee To: kernel-team@lists.ubuntu.com Subject: [PATCH][l-r-m][SRU][E] UBUNTU: [Packaging] Add support for nvidia-435 dkms builds Date: Tue, 17 Dec 2019 10:18:41 -0600 Message-Id: <20191217161841.84467-3-seth.forshee@canonical.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191217161841.84467-1-seth.forshee@canonical.com> References: <20191217161841.84467-1-seth.forshee@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/1856407 Signed-off-by: Seth Forshee --- debian/control.stub | 44 ++++++++++++++++++++++++++++++++++++++++++++ debian/dkms-versions | 1 + debian/rules | 6 ++++++ 3 files changed, 51 insertions(+) diff --git a/debian/control.stub b/debian/control.stub index ffae3573d7f4..39114e81dbaa 100644 --- a/debian/control.stub +++ b/debian/control.stub @@ -105,3 +105,47 @@ 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. + +Package: linux-modules-nvidia-435-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-435 +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 + linux-image-nvidia-FLAVOUR meta-package, which will ensure that upgrades work + correctly, and that supporting packages are also installed. + +Package: linux-modules-nvidia-435-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-435 +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 + linux-image-nvidia-FLAVOUR meta-package, which will ensure that upgrades work + correctly, and that supporting packages are also installed. + +Package: linux-modules-nvidia-435-generic +Build-Profiles: +Architecture: amd64 +Section: kernel +Depends: ${misc:Depends}, linux-modules-nvidia-435-ABI-generic (= ${binary:Version}) +Description: Extra drivers for nvidia-435 for the generic flavour + Install extra signed nvidia-435 modules compatible with the generic flavour. + +Package: linux-modules-nvidia-435-lowlatency +Build-Profiles: +Architecture: amd64 +Section: kernel +Depends: ${misc:Depends}, linux-modules-nvidia-435-ABI-lowlatency (= ${binary:Version}) +Description: Extra drivers for nvidia-435 for the lowlatency flavour + Install extra signed nvidia-435 modules compatible with the lowlatency flavour. diff --git a/debian/dkms-versions b/debian/dkms-versions index a948741d0de8..c904e822d2f8 100644 --- a/debian/dkms-versions +++ b/debian/dkms-versions @@ -1,4 +1,5 @@ zfs-linux 0.8.1-1ubuntu14.2 nvidia-graphics-drivers-390 390.129-0ubuntu2 nvidia-graphics-drivers-430 430.50-0ubuntu2 +nvidia-graphics-drivers-435 435.21-0ubuntu2 virtualbox 6.0.14-dfsg-1 diff --git a/debian/rules b/debian/rules index 898c1c0768cf..54040a53656c 100755 --- a/debian/rules +++ b/debian/rules @@ -16,6 +16,7 @@ series = $(shell dpkg-parsechangelog | sed -ne 's/^Distribution: *//p' | sed -e 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_435_version=$(shell gawk '/^nvidia-graphics-drivers-435/ { print $$2; }' debian/dkms-versions) test: echo "$(src_fullversion) $(src_version)" @@ -98,6 +99,11 @@ nvidia-%: $(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-435-$(src_abi)-$* + install -d debian/linux-modules-nvidia-435-$(src_abi)-$*/usr/lib/linux/triggers + $(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) + prepare-dkms: mkdir -p $(dkms_dir) ln -s /usr/src $(dkms_dir)/headers