From patchwork Tue Aug 25 15:47:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Milone X-Patchwork-Id: 1351140 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 4BbYLM0ggxz9sTN; Wed, 26 Aug 2020 01:48:27 +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 1kAbBP-00021a-Ov; Tue, 25 Aug 2020 15:48:23 +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 1kAbBO-00020v-BG for kernel-team@lists.ubuntu.com; Tue, 25 Aug 2020 15:48:22 +0000 Received: from mail-wr1-f72.google.com ([209.85.221.72]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kAbBO-0001cY-2z for kernel-team@lists.ubuntu.com; Tue, 25 Aug 2020 15:48:22 +0000 Received: by mail-wr1-f72.google.com with SMTP id f7so5273318wrs.8 for ; Tue, 25 Aug 2020 08:48:22 -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=M5tcODnnXSylxSYKTMSf3J2D4XMl/vo5oNAfh+BC/vE=; b=tV8CB48LXFlqWeGv8RsB05yMWRTtKQIHehNlJjp5XV5I3euXrUKBY2dlJ3s6a9T46W JvEZZKTpzKSOHeTBCyf+kEi0VbJU+DQ9GvB885W50N642UrK31hCA+Gj5FFAi3l79EsR SIMBGQOJRLFcMGbBRsylTcAIqy9ONc79QXvvUT3qaosY0kBRJtncJG152vkWYC8RD6LI piTdsWF7hixJlTVWC2I5ZF/U/zx0TbKeieDoDyM6ZqBVtdeI4ru9dJ4P+0bsRUhdFwpM 53P0Lh/sh4arSVLBXEnf3P9rXvAaSRHpdjDuLyxUcChajneQfAuTQ1YlyOdPubEjhT4I XYbQ== X-Gm-Message-State: AOAM5328Lrf134N2/R0VJHbZObEn0dk1hC931wKQS5Ji3doUneWPqKKk P8WvJpj33AP19umTC/6kP/WM7iJFbVjsw1jH/wNdx7gK+3mA/be9eA32SajQTgO2ihDiKI+8A3Q 4Yydx8ylarsmuYjy7cMfZEAAN/IL0w59T3uxXmoUHAA== X-Received: by 2002:a05:600c:287:: with SMTP id 7mr2625450wmk.101.1598370501350; Tue, 25 Aug 2020 08:48:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzgGAj1KTLDThwdiTAfDImDkcoVdJr9FiuEiHl0Lpw1xEDnEvnKBK8H3MwMtq7kDKsHzoSEpg== X-Received: by 2002:a05:600c:287:: with SMTP id 7mr2625419wmk.101.1598370501023; Tue, 25 Aug 2020 08:48:21 -0700 (PDT) Received: from thinkpad.lan (dynamic-adsl-94-34-39-30.clienti.tiscali.it. [94.34.39.30]) by smtp.gmail.com with ESMTPSA id h14sm7115715wml.30.2020.08.25.08.48.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 08:48:20 -0700 (PDT) From: Alberto Milone To: kernel-team@lists.ubuntu.com Subject: [PATCH 3/10 B][SRU][Hwe] UBUNTU: [packaging] add signed modules for nvidia 418-server 440-server Date: Tue, 25 Aug 2020 17:47:49 +0200 Message-Id: <20200825154756.3753617-4-alberto.milone@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200825154756.3753617-1-alberto.milone@canonical.com> References: <20200825154756.3753617-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" Enable building only on amd64 using the do_dkms_nvidia_server flag. Also, modify the regular expression in 2-binary-arch.mk, so that names such as nvidia-440srv are allowed. BugLink: https://bugs.launchpad.net/bugs/1881137 --- debian.master/rules.d/amd64.mk | 1 + debian/dkms-versions | 2 ++ debian/rules | 11 ++++++++--- debian/rules.d/2-binary-arch.mk | 5 +++++ debian/scripts/dkms-build | 2 +- 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/debian.master/rules.d/amd64.mk b/debian.master/rules.d/amd64.mk index b1f62a796c22..d253402ae066 100644 --- a/debian.master/rules.d/amd64.mk +++ b/debian.master/rules.d/amd64.mk @@ -23,5 +23,6 @@ do_tools_common = true do_tools_acpidbg = true do_zfs = true do_dkms_nvidia = true +do_dkms_nvidia_server = true do_dkms_vbox = true do_dkms_wireguard = true diff --git a/debian/dkms-versions b/debian/dkms-versions index 93c5b2e2efbe..f4b24c7f87e3 100644 --- a/debian/dkms-versions +++ b/debian/dkms-versions @@ -2,5 +2,7 @@ zfs-linux 0.8.1-1ubuntu14.4 nvidia-graphics-drivers-390 390.138-0ubuntu0.19.10.1 nvidia-graphics-drivers-440 440.100-0ubuntu0.19.10.1 nvidia-graphics-drivers-435 435.21-0ubuntu2 +nvidia-graphics-drivers-418-server 0 +nvidia-graphics-drivers-440-server 0 virtualbox 6.0.14-dfsg-1 wireguard-linux-compat 1.0.20200611-1ubuntu1~19.10.1 diff --git a/debian/rules b/debian/rules index be87007d6ac1..5884455e0f4f 100755 --- a/debian/rules +++ b/debian/rules @@ -45,6 +45,7 @@ ifneq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH)) disable_d_i=true do_zfs=false do_dkms_nvidia=false + do_dkms_nvidia_server=false do_dkms_vbox=false do_dkms_wireguard=false endif @@ -80,6 +81,7 @@ ifneq ($(filter autopkgtest,$(DEB_BUILD_PROFILES)),) disable_d_i=true do_zfs=false do_dkms_nvidia=false + do_dkms_nvidia_server=false do_dkms_vbox=false endif @@ -90,6 +92,7 @@ ifeq ($(do_mainline_build),true) no_dumpfile=1 do_zfs=false do_dkms_nvidia=false + do_dkms_nvidia_server=false do_dkms_vbox=false skipabi=true skipmodule=true @@ -121,9 +124,11 @@ do_any_tools=$(sort $(filter-out false,$(do_linux_tools) $(do_cloud_tools))) # Versions of dkms packages. dkms_zfs_linux_version=$(shell gawk '/^zfs-linux / { print $$2; }' debian/dkms-versions) -dkms_nvidia_390_version=$(shell gawk '/^nvidia-graphics-drivers-390/ { 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) +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) dkms_vbox_guest_version=$(shell gawk '/^virtualbox/ { print $$2; }' debian/dkms-versions) dkms_wireguard_version=$(shell gawk '/^wireguard-linux-compat / { print $$2; }' debian/dkms-versions) diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 72adce739413..81f93f249b83 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -404,6 +404,11 @@ ifeq ($(do_dkms_nvidia),true) $(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) endif +ifeq ($(do_dkms_nvidia_server),true) + $(call build_dkms, $(bldinfo_pkg_name)-$*, $(pkgdir_bldinfo)/usr/lib/linux/$(abi_release)-$*/signatures, "", 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 build_dkms, $(bldinfo_pkg_name)-$*, $(pkgdir_bldinfo)/usr/lib/linux/$(abi_release)-$*/signatures, "", 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) +endif + ifeq ($(do_extras_package),true) $(if $(filter true,$(do_dkms_vbox)),$(call build_dkms, $(mods_pkg_name)-$*, $(pkgdir)/lib/modules/$(abi_release)-$*/kernel, "", virtualbox-guest, pool/multiverse/v/virtualbox/virtualbox-guest-dkms_$(dkms_vbox_guest_version)_all.deb)) endif diff --git a/debian/scripts/dkms-build b/debian/scripts/dkms-build index 638b3122a05d..c1751ffaa016 100755 --- a/debian/scripts/dkms-build +++ b/debian/scripts/dkms-build @@ -234,7 +234,7 @@ done # as squirreled away, and the log in case it is useful. Finally pass a formed # signing command line in case we need to do that. dkms_build_specific="$srcdir/$0--$package" -dkms_build_generic=$(echo "$dkms_build_specific" | sed -n -e 's/-[0-9][0-9]*$/-N/p') +dkms_build_generic=$(echo "$dkms_build_specific" | sed -n -e 's/-[0-9][0-9]*[a-z]*$/-N/p') for dkms_build in "$dkms_build_specific" "$dkms_build_generic" do if [ -z "$dkms_build" -o ! -e "$dkms_build" ]; then