From patchwork Tue Aug 25 15:47:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Milone X-Patchwork-Id: 1351141 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 4BbYLR2Twmz9sTN; Wed, 26 Aug 2020 01:48:31 +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 1kAbBU-00023x-1u; Tue, 25 Aug 2020 15:48:28 +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 1kAbBR-00022Y-FU for kernel-team@lists.ubuntu.com; Tue, 25 Aug 2020 15:48:25 +0000 Received: from mail-wr1-f69.google.com ([209.85.221.69]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kAbBR-0001d0-80 for kernel-team@lists.ubuntu.com; Tue, 25 Aug 2020 15:48:25 +0000 Received: by mail-wr1-f69.google.com with SMTP id r11so5164927wrj.0 for ; Tue, 25 Aug 2020 08:48:25 -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=hUK0dhCrIo4uFbmrFNAG3TMQMZ72xKbQJBS4JNHAywI=; b=idy5e2d9J9z+dAwHQ/B+QkKIBwm+UL5g2+j5/1ZcRPv5MfxmBuJWbfMtLVQfvL63Z+ nkHuAUCYqt9guNvhK7wUbaMjLQuHBohUbRoqf6vIwns0qck/KWhpyoeUbsP/5BBWVMNB KWX8nMq0Hl+MXuqnHUApK1LJ0+MzE8kC8wnG5JfsETQwyRDbPKutAtGuF1DjDAuKGA9z RcH46FNm04WoCElKRjvNidJ/MFJoGEi25nFGOBJxS9R0Vy/LWs1/M1KzCZRDNDQyC5B9 mgiE8w4VUkioDpXUtt3teqbfugetIj+2Y1ZfWrEaADPxKe7bipN6NKaqSt2/DBaimb4T H9kg== X-Gm-Message-State: AOAM531TBDnGIuH7xQBqM27Jmd/vhqr+3IKY375jp3zCTlRTClJwRoky QWSUmnFB/1YkI4/CwBie1HYTAN4pbTfJ6XF2/QoXj3YoiSl+W1T2vR+i9AZIzGtgwPEFhWgOgk7 wAicuvN43fs41prabgw6aXnVUEFayL9fz7QnD4vtA1g== X-Received: by 2002:a5d:5084:: with SMTP id a4mr11657434wrt.191.1598370504422; Tue, 25 Aug 2020 08:48:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzk46TNqxRw+2CYMIaBqJpxJEkakJOFBWiwiNQv5Oaymx5d8fop5BKBopCWUOxiEY3AKIc9EA== X-Received: by 2002:a5d:5084:: with SMTP id a4mr11657404wrt.191.1598370504097; Tue, 25 Aug 2020 08:48:24 -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.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 08:48:23 -0700 (PDT) From: Alberto Milone To: kernel-team@lists.ubuntu.com Subject: [PATCH 4/10 B][SRU][Hwe] UBUNTU: [packaging] add signed modules for 450 and 450-server Date: Tue, 25 Aug 2020 17:47:50 +0200 Message-Id: <20200825154756.3753617-5-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" While the 450 series replaces the 440 series, the 450-server series is only an addition to the 440-server series. BugLink: https://bugs.launchpad.net/bugs/1887674 Signed-off-by: Alberto Milone --- debian/dkms-versions | 3 ++- debian/rules | 3 ++- debian/rules.d/2-binary-arch.mk | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/dkms-versions b/debian/dkms-versions index f4b24c7f87e3..fe4c8e11b6d6 100644 --- a/debian/dkms-versions +++ b/debian/dkms-versions @@ -1,8 +1,9 @@ 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-450 0 nvidia-graphics-drivers-418-server 0 nvidia-graphics-drivers-440-server 0 +nvidia-graphics-drivers-450-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 5884455e0f4f..0d2ed31a824a 100755 --- a/debian/rules +++ b/debian/rules @@ -126,9 +126,10 @@ do_any_tools=$(sort $(filter-out false,$(do_linux_tools) $(do_cloud_tools))) 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_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_450_version=$(shell gawk '/^nvidia-graphics-drivers-450 / { 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_nvidia_450_server_version=$(shell gawk '/^nvidia-graphics-drivers-450-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 81f93f249b83..06f552484438 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -400,13 +400,14 @@ endif 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_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-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) $(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-450, pool/restricted/n/nvidia-graphics-drivers-450/nvidia-kernel-source-450_$(dkms_nvidia_450_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-450/nvidia-dkms-450_$(dkms_nvidia_450_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) + $(call build_dkms, $(bldinfo_pkg_name)-$*, $(pkgdir_bldinfo)/usr/lib/linux/$(abi_release)-$*/signatures, "", nvidia-450srv, pool/restricted/n/nvidia-graphics-drivers-450-server/nvidia-kernel-source-450-server_$(dkms_nvidia_450_server_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-450-server/nvidia-dkms-450-server_$(dkms_nvidia_450_server_version)_$(arch).deb) endif ifeq ($(do_extras_package),true)