From patchwork Wed Jul 1 15:04:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Milone X-Patchwork-Id: 1320591 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 49xkzX73cDz9sTZ; Thu, 2 Jul 2020 01:04:56 +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 1jqeI9-0005cw-E2; Wed, 01 Jul 2020 15:04:53 +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 1jqeI8-0005cb-FE for kernel-team@lists.ubuntu.com; Wed, 01 Jul 2020 15:04:52 +0000 Received: from mail-ed1-f71.google.com ([209.85.208.71]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jqeI8-0008VB-6F for kernel-team@lists.ubuntu.com; Wed, 01 Jul 2020 15:04:52 +0000 Received: by mail-ed1-f71.google.com with SMTP id da18so21116482edb.13 for ; Wed, 01 Jul 2020 08:04:52 -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=wzY4aPYkD9MGIw55m4jxnfC9e9Mtm0TanHmPARlGkxQ=; b=RALagglpbGEpoYyKFWQr9WQazq5duk/FYKysUwHsFSGyJiJyBvW6oigDlGAygJVj7R D4T5VZ+0YEiaewNWpCchkntzMW8XsBVZ9L/JW591fyr6HyP+XnWR9r4kE7UBZLJ7FXea xGlm98qaZUd1mXRio822oFIdC5W8ccTTHwExieqnVfGzQxI5mK5WRGsdyjcVnnhmDhme X3J2+fn+MWwzVEtL45T40g9+Ym48sfvgq6bRXgcfXYKZBuKAMm1DLNwy9qsYHavR1rSO Is/OKeUVCD+w3zsv7LB1pO5+GBybFpTA/horpr4LNZ19hL6rrRmREXAXDGTvkDx12MY5 2yDA== X-Gm-Message-State: AOAM533FQZCiBpQAOpJfRves6zsOLcYkxmbAfC6NrqFl/LCNxtabQVqp 53uFsMqZAXoDg8R4srRH4DjhnG7PiPQz/ylZkdv3HaLaryW/NglIAP8oxfzzZWtSyWHLGamFxTJ xV2GSglKXAn1o5p0wJJLavcwbOtnHCLhBT1ME80/RvA== X-Received: by 2002:a50:c88d:: with SMTP id d13mr30005320edh.104.1593615891351; Wed, 01 Jul 2020 08:04:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyhLbfwZBukGY2zreYnKuich8llZjCPLZk0mYsoseZMoTtDJ0Y9QcFuXyAfh0hrR67lZcp99w== X-Received: by 2002:a50:c88d:: with SMTP id d13mr30005290edh.104.1593615891125; Wed, 01 Jul 2020 08:04:51 -0700 (PDT) Received: from thinkpad.lan (dynamic-adsl-94-34-35-151.clienti.tiscali.it. [94.34.35.151]) by smtp.gmail.com with ESMTPSA id o8sm4789248ejj.102.2020.07.01.08.04.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 08:04:50 -0700 (PDT) From: Alberto Milone To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/1 B-HWE-5.4][SRU] UBUNTU: [packaging] add signed modules for the 418-server and the 440-server flavours Date: Wed, 1 Jul 2020 17:04:44 +0200 Message-Id: <20200701150444.453640-2-alberto.milone@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200701150444.453640-1-alberto.milone@canonical.com> References: <20200701150444.453640-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: , Cc: apw@canonical.com 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/1882093 Signed-off-by: Alberto Milone --- debian.master/rules.d/amd64.mk | 1 + debian/dkms-versions | 2 ++ debian/rules | 10 +++++++--- debian/rules.d/2-binary-arch.mk | 5 +++++ debian/scripts/dkms-build | 2 +- 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/debian.master/rules.d/amd64.mk b/debian.master/rules.d/amd64.mk index daffd0d7a3dc..6515b13314ca 100644 --- a/debian.master/rules.d/amd64.mk +++ b/debian.master/rules.d/amd64.mk @@ -23,4 +23,5 @@ do_tools_common = true do_tools_acpidbg = true do_zfs = true do_dkms_nvidia = true +do_dkms_nvidia_server = true do_dkms_wireguard = true diff --git a/debian/dkms-versions b/debian/dkms-versions index 6e4841390572..e7b1dda01e3f 100644 --- a/debian/dkms-versions +++ b/debian/dkms-versions @@ -3,4 +3,6 @@ zfs-linux 0.7.5-1ubuntu16.9 nvidia-graphics-drivers-390 390.138-0ubuntu0.18.04.1 nvidia-graphics-drivers-435 435.21-0ubuntu0.18.04.2 nvidia-graphics-drivers-440 440.100-0ubuntu0.18.04.1 +nvidia-graphics-drivers-418-server 0 +nvidia-graphics-drivers-440-server 0 wireguard-linux-compat 1.0.20200611-1ubuntu1~18.04.1 diff --git a/debian/rules b/debian/rules index b517f41a5beb..bebeb4e9f243 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_wireguard=false endif @@ -78,6 +79,7 @@ ifeq ($(do_mainline_build),true) no_dumpfile=1 do_zfs=false do_dkms_nvidia=false + do_dkms_nvidia_server=false skipabi=true skipmodule=true skipretpoline=true @@ -112,9 +114,11 @@ 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_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) dkms_wireguard_version=$(shell gawk '/^wireguard-linux-compat / { print $$2; }' debian/dkms-versions) # Debian Build System targets diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 62af6bf55f11..b7d88126a3b7 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -409,6 +409,11 @@ ifeq ($(do_dkms_nvidia),true) $(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 +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 + # Build the final ABI information. install -d $(abidir) sed -e 's/^\(.\+\)[[:space:]]\+\(.\+\)[[:space:]]\(.\+\)$$/\3 \2 \1/' \ diff --git a/debian/scripts/dkms-build b/debian/scripts/dkms-build index 908f0316e311..55d09d920746 100755 --- a/debian/scripts/dkms-build +++ b/debian/scripts/dkms-build @@ -180,7 +180,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 -e 's/-[0-9][0-9]*$/-N/') +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 [ ! -e "$dkms_build" ]; then