From patchwork Fri Jan 22 16:23:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 1430428 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=) 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 4DMl1Y4q4yz9sCD; Sat, 23 Jan 2021 03:23:29 +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 1l2zDa-0004G0-6l; Fri, 22 Jan 2021 16:23:26 +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 1l2zDU-0004DE-7s for kernel-team@lists.ubuntu.com; Fri, 22 Jan 2021 16:23:20 +0000 Received: from mail-ed1-f70.google.com ([209.85.208.70]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1l2zDT-0006Xh-VS for kernel-team@lists.ubuntu.com; Fri, 22 Jan 2021 16:23:20 +0000 Received: by mail-ed1-f70.google.com with SMTP id a26so3191414edx.8 for ; Fri, 22 Jan 2021 08:23: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:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=R3LQFxNSFvfn6dqjrH0wGHL9yRWpSdNhelNXQE3IPJo=; b=A+SleukfUT4aaU2ngNqF9L60dYYWcEU9cEFhDOeBSVF/lr0xcPZAo8rnQ7941TdwhF aGI626+tl/ZGttRnG6OuUY3YFndH1QXSEwFj99YYgVn8weSVor8WaM12OqJ3Ox6Z0M3R t5C8khR5J+AEmXhdW+uPFrwVMBX110/9hoWp7UNRqecjLAniqrr5JJzv6m6VFU3TKXwG I86jYb75akiR+10QNFWxgoIwkm26b8D+T/gFA6qpgeQ5cDrH7/UEAxNvaY4SMPiglb0e MnDvLePT4fsJxLBZMZhp24mvd1lPQh8XqMsBzAZ/dzHbu0dV6VP1FGFeh2HbOwf/77BG yrXg== X-Gm-Message-State: AOAM533/Q2VnZ459IKMOFgqd5DDnWdLXw7cRRD+zZ6iu2V3W8omCpZci PvM+RKMRbUKullAO6z1fbzRjdHZlJw1P8BnD5YYn3V+0HrZrZNZMWsyX/xyCYcAG1j8m+8aIC7U PN++Z9iiChjGURJ4G0kAOPCule3DPb3RtQjpeiMtdww== X-Received: by 2002:a17:906:404a:: with SMTP id y10mr3426662ejj.331.1611332598648; Fri, 22 Jan 2021 08:23:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJwmFFIcLluCF6VvtdyGV2zD2c7b9Sr4i2Ke0ia4nXAzZMvFZw9DOGwTs1WT6b9GjiGlslxJ1Q== X-Received: by 2002:a17:906:404a:: with SMTP id y10mr3426637ejj.331.1611332598150; Fri, 22 Jan 2021 08:23:18 -0800 (PST) Received: from localhost ([2001:470:6973:2:cb60:1396:20d7:1932]) by smtp.gmail.com with ESMTPSA id hb19sm4545381ejc.16.2021.01.22.08.23.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 08:23:17 -0800 (PST) From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/9] UBUNTU: [Packaging] generate nvidia version mappings at clean time Date: Fri, 22 Jan 2021 16:23:03 +0000 Message-Id: <20210122162312.459010-3-apw@canonical.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210122162312.459010-1-apw@canonical.com> References: <20210122162312.459010-1-apw@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: Andy Whitcroft Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Generate the rules and control fragments from debian/rules.config at clean time so we do not have to maintain this package directly. Signed-off-by: Andy Whitcroft --- debian/control.d/meta-nvidia | 148 ----------------------- debian/control.d/nvidia | 227 ----------------------------------- debian/package.config | 2 + debian/rules | 194 +----------------------------- debian/rules.in | 139 +++++++++++++++++++++ debian/scripts/gen-rules | 85 +++++++++++++ debian/source/options | 3 + 7 files changed, 233 insertions(+), 565 deletions(-) delete mode 100644 debian/control.d/meta-nvidia delete mode 100644 debian/control.d/nvidia create mode 100644 debian/package.config create mode 100755 debian/rules.in create mode 100755 debian/scripts/gen-rules diff --git a/debian/control.d/meta-nvidia b/debian/control.d/meta-nvidia deleted file mode 100644 index 77a9ad7..0000000 --- a/debian/control.d/meta-nvidia +++ /dev/null @@ -1,148 +0,0 @@ -Package: linux-modules-nvidia-390-generic${variant:suffix} -Build-Profiles: -Architecture: amd64 -Section: kernel -Provides: ${dkms:nvidia-390-modules} -Depends: - ${misc:Depends}, - linux-modules-nvidia-390-@ABI@-generic (= ${binary:Version}), - ${nvk:nvidia-390} -Description: Extra drivers for nvidia-390 for generic${variant:suffix} - Install extra signed nvidia-390 modules compatible with - generic${variant:suffix} - -Package: linux-modules-nvidia-450-generic${variant:suffix} -Build-Profiles: -Architecture: amd64 -Section: kernel -Provides: ${dkms:nvidia-450-modules}, nvidia-prebuilt-kernel -Depends: - ${misc:Depends}, - linux-modules-nvidia-450-@ABI@-generic (= ${binary:Version}), - ${nvk:nvidia-450} -Description: Extra drivers for nvidia-450 for generic${variant:suffix} - Install extra signed nvidia-450 modules compatible with - generic${variant:suffix} - -Package: linux-modules-nvidia-455-generic${variant:suffix} -Build-Profiles: -Architecture: amd64 -Section: kernel -Provides: ${dkms:nvidia-455-modules}, nvidia-prebuilt-kernel -Depends: - ${misc:Depends}, - linux-modules-nvidia-455-@ABI@-generic (= ${binary:Version}), - ${nvk:nvidia-455} -Description: Extra drivers for nvidia-455 for generic${variant:suffix} - Install extra signed nvidia-455 modules compatible with - generic${variant:suffix} - -Package: linux-modules-nvidia-418-server-generic${variant:suffix} -Build-Profiles: -Architecture: amd64 -Section: kernel -Provides: ${dkms:nvidia-418-server-modules}, nvidia-prebuilt-kernel -Depends: - ${misc:Depends}, - linux-modules-nvidia-418-server-@ABI@-generic (= ${binary:Version}), - ${nvk:nvidia-418-server} -Description: Extra drivers for nvidia-418-server for generic${variant:suffix} - Install extra signed nvidia-418-server modules compatible with - generic${variant:suffix} - -Package: linux-modules-nvidia-440-server-generic${variant:suffix} -Build-Profiles: -Architecture: amd64 -Section: kernel -Provides: ${dkms:nvidia-440-server-modules}, nvidia-prebuilt-kernel -Depends: - ${misc:Depends}, - linux-modules-nvidia-440-server-@ABI@-generic (= ${binary:Version}), - ${nvk:nvidia-440-server} -Description: Extra drivers for nvidia-440-server for generic${variant:suffix} - Install extra signed nvidia-440-server modules compatible with - generic${variant:suffix} - -Package: linux-modules-nvidia-450-server-generic${variant:suffix} -Build-Profiles: -Architecture: amd64 -Section: kernel -Provides: ${dkms:nvidia-450-server-modules}, nvidia-prebuilt-kernel -Depends: - ${misc:Depends}, - linux-modules-nvidia-450-server-@ABI@-generic (= ${binary:Version}), - ${nvk:nvidia-450-server} -Description: Extra drivers for nvidia-450-server for generic${variant:suffix} - Install extra signed nvidia-450-server modules compatible with - generic${variant:suffix} - -Package: linux-modules-nvidia-390-lowlatency${variant:suffix} -Build-Profiles: -Architecture: amd64 -Section: kernel -Provides: ${dkms:nvidia-390-modules} -Depends: - ${misc:Depends}, - linux-modules-nvidia-390-@ABI@-lowlatency (= ${binary:Version}), - ${nvk:nvidia-390} -Description: Extra drivers for nvidia-390 for lowlatency${variant:suffix} - Install extra signed nvidia-390 modules compatible with - lowlatency${variant:suffix} - -Package: linux-modules-nvidia-450-lowlatency${variant:suffix} -Build-Profiles: -Architecture: amd64 -Section: kernel -Provides: ${dkms:nvidia-450-modules}, nvidia-prebuilt-kernel -Depends: - ${misc:Depends}, - linux-modules-nvidia-450-@ABI@-lowlatency (= ${binary:Version}), - ${nvk:nvidia-450} -Description: Extra drivers for nvidia-450 for lowlatency${variant:suffix} - Install extra signed nvidia-450 modules compatible with - lowlatency${variant:suffix} - -Package: linux-modules-nvidia-455-lowlatency${variant:suffix} -Build-Profiles: -Architecture: amd64 -Section: kernel -Provides: ${dkms:nvidia-455-modules}, nvidia-prebuilt-kernel -Depends: - ${misc:Depends}, - linux-modules-nvidia-455-@ABI@-lowlatency (= ${binary:Version}), - ${nvk:nvidia-455} -Description: Extra drivers for nvidia-455 for lowlatency${variant:suffix} - Install extra signed nvidia-455 modules compatible with - lowlatency${variant:suffix} - -Package: linux-modules-nvidia-418-server-lowlatency${variant:suffix} -Build-Profiles: -Architecture: amd64 -Section: kernel -Provides: ${dkms:nvidia-418-server-modules}, nvidia-prebuilt-kernel -Depends: ${misc:Depends}, - linux-modules-nvidia-418-server-@ABI@-lowlatency (= ${binary:Version}), - ${nvk:nvidia-418-server} -Description: Extra drivers for nvidia-418-server for the lowlatency flavour - Install extra signed nvidia-418-server modules compatible with the lowlatency flavour. - -Package: linux-modules-nvidia-440-server-lowlatency${variant:suffix} -Build-Profiles: -Architecture: amd64 -Section: kernel -Provides: ${dkms:nvidia-440-server-modules}, nvidia-prebuilt-kernel -Depends: ${misc:Depends}, - linux-modules-nvidia-440-server-@ABI@-lowlatency (= ${binary:Version}), - ${nvk:nvidia-440-server} -Description: Extra drivers for nvidia-440-server for the lowlatency flavour - Install extra signed nvidia-440-server modules compatible with the lowlatency flavour. - -Package: linux-modules-nvidia-450-server-lowlatency${variant:suffix} -Build-Profiles: -Architecture: amd64 -Section: kernel -Provides: ${dkms:nvidia-450-server-modules}, nvidia-prebuilt-kernel -Depends: ${misc:Depends}, linux-modules-nvidia-450-server-@ABI@-lowlatency (= ${binary:Version}), - ${nvk:nvidia-450-server} -Description: Extra drivers for nvidia-450-server for the lowlatency flavour - Install extra signed nvidia-450-server modules compatible with the lowlatency flavour. diff --git a/debian/control.d/nvidia b/debian/control.d/nvidia deleted file mode 100644 index 53fc1b5..0000000 --- a/debian/control.d/nvidia +++ /dev/null @@ -1,227 +0,0 @@ -Package: linux-modules-nvidia-390-@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, -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 - one of the linux-modules-nvidia-390-generic* meta-packages, - which will ensure that upgrades work correctly, and that supporting packages are - also installed. - -Package: linux-modules-nvidia-450-@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, -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 - one of the linux-modules-nvidia-450-generic* meta-packages, - which will ensure that upgrades work correctly, and that supporting packages are - also installed. - -Package: linux-modules-nvidia-455-@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, -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 - one of the linux-modules-nvidia-455-generic* meta-packages, - which will ensure that upgrades work correctly, and that supporting packages are - also installed. - -Package: linux-modules-nvidia-418-server-@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, -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 - one of the linux-modules-nvidia-418-server-generic* meta-packages, - which will ensure that upgrades work correctly, and that supporting packages are - also installed. - -Package: linux-modules-nvidia-440-server-@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, -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 - one of the linux-modules-nvidia-440-server-generic* meta-packages, - which will ensure that upgrades work correctly, and that supporting packages are - also installed. - -Package: linux-modules-nvidia-450-server-@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, -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 - one of the linux-modules-nvidia-450-server-generic* meta-packages, - which will ensure that upgrades work correctly, and that supporting packages are - also installed. - -Package: linux-modules-nvidia-390-@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, -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 - one of the linux-modules-nvidia-390-lowlatency* meta-packages, - which will ensure that upgrades work correctly, and that supporting packages are - also installed. - -Package: linux-modules-nvidia-450-@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, -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 - one of the linux-modules-nvidia-450-lowlatency* meta-packages, - which will ensure that upgrades work correctly, and that supporting packages are - also installed. - -Package: linux-modules-nvidia-455-@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, -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 - one of the linux-modules-nvidia-455-lowlatency* meta-packages, - which will ensure that upgrades work correctly, and that supporting packages are - also installed. - -Package: linux-modules-nvidia-418-server-@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, -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 - one of the linux-modules-nvidia-418-server-lowlatency* meta-packages, - which will ensure that upgrades work correctly, and that supporting packages are - also installed. - -Package: linux-modules-nvidia-440-server-@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, -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 - one of the linux-modules-nvidia-440-server-lowlatency* meta-packages, - which will ensure that upgrades work correctly, and that supporting packages are - also installed. - -Package: linux-modules-nvidia-450-server-@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, -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 - one of the linux-modules-nvidia-450-server-lowlatency* meta-packages, - which will ensure that upgrades work correctly, and that supporting packages are - also installed. diff --git a/debian/package.config b/debian/package.config new file mode 100644 index 0000000..2b69799 --- /dev/null +++ b/debian/package.config @@ -0,0 +1,2 @@ +build generic amd64 +build lowlatency amd64 diff --git a/debian/rules b/debian/rules index 1d799fe..7c00598 100755 --- a/debian/rules +++ b/debian/rules @@ -1,194 +1,8 @@ #! /usr/bin/make -f -##export DH_VERBOSE := 1 - -arch = $(shell dpkg-architecture -qDEB_HOST_ARCH) - -# Work out the source package name and version. The version -# is identical to this package less any rebuild suffix (+lrmN). -src_package := $(shell LC_ALL=C dpkg-parsechangelog -SSource) -src_fullversion = $(shell LC_ALL=C dpkg-parsechangelog -SVersion) -src_abi = $(shell echo "$(src_fullversion)" | sed -ne 's/\([0-9]*\.[0-9]*\.[0-9]*\-[0-9]*\)\..*/\1/p') -src_version = $(shell echo $(src_fullversion) | sed -e 's/+[0-9][0-9]*//') -src_series = $(shell dpkg-parsechangelog -SDistribution | sed -e 's/-\(security\|updates\|proposed\)$$//') -src_kernel = $(shell echo "$(src_package)" | sed -e 's/restricted-modules-//') - -dkms_nvidia_390_version=$(shell gawk '/^nvidia-graphics-drivers-390 / { print $$2; }' debian/dkms-versions) -dkms_nvidia_450_version=$(shell gawk '/^nvidia-graphics-drivers-450 / { print $$2; }' debian/dkms-versions) -dkms_nvidia_455_version=$(shell gawk '/^nvidia-graphics-drivers-455 / { 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) - -nvidia_390_upstream_version=$(shell echo "$(dkms_nvidia_390_version)" | cut -d '-' -f 1) -nvidia_450_upstream_version=$(shell echo "$(dkms_nvidia_450_version)" | cut -d '-' -f 1) -nvidia_455_upstream_version=$(shell echo "$(dkms_nvidia_455_version)" | cut -d '-' -f 1) -nvidia_418_server_upstream_version=$(shell echo "$(dkms_nvidia_418_server_version)" | cut -d '-' -f 1) -nvidia_440_server_upstream_version=$(shell echo "$(dkms_nvidia_440_server_version)" | cut -d '-' -f 1) -nvidia_450_server_upstream_version=$(shell echo "$(dkms_nvidia_450_server_version)" | cut -d '-' -f 1) - -# Get variants, assuming primary if debian/variants is not present -variants = -- -ifneq (,$(wildcard debian/variants)) - variants := $(shell cat debian/variants) -endif - -control_files := debian/control.common -# control files only wanted for the primary variant -primary_control_files := $(shell LC_ALL=C ls -d debian/control.d/transitionals-* 2>/dev/null) -ifneq ($(filter --, $(variants)),) - control_files += $(primary_control_files) -endif -control_files += $(filter-out $(primary_control_files),$(shell LC_ALL=C ls -d debian/control.d/*)) - -test: - echo "$(src_fullversion) $(src_version)" - -# We build our control file. This has to be done before dh runs otherwise -# we have no binary files and we will not run the appropriate targets. -pre-clean: tp_key=test:provides\(-full\|-image\|-headers\|-modules-extra\) -pre-clean: $(control_files) - rm -f debian/control.tmp - for i in $^; do \ - if grep -q "{variant:" $$i; then \ - variant_first='yes'; \ - for variant in $(variants); do \ - variant="$$(echo "$$variant" | sed -e 's/--//')"; \ - sed \ - -e "s/\$${variant:suffix}/$$variant/g" \ - -e "s/\(\$${$(tp_key)[^}]*}\)/$${variant_first:+\1}/g" \ - <$$i; \ - echo ""; \ - variant_first=''; \ - done; \ - else \ - cat $$i; \ - echo ""; \ - fi; \ - done | sed \ - -e "s/\(\$${$(tp_key)\([^}]*\)}\)/kernel-testing--$(src_kernel)-\1-\2,/g" \ - -e "s/@SRCPKGNAME@/$(src_package)/g" \ - -e "s/@ABI@/$(src_abi)/g" \ - -e "s/@VERSION@/$(src_version)/g" \ - -e "s/@SERIES@/$(src_series)/g" \ - >debian/control.tmp - rm -f debian/control - mv debian/control.tmp debian/control - rm -rf ./$(src_version) UNSIGNED SIGNED - rm -f debian/linux-modules-*.install \ - debian/linux-modules-*.preinst \ - debian/linux-modules-*.prerm \ - debian/linux-modules-*.postinst \ - debian/linux-modules-*.postrm - rm -rf $(dkms_dir) - -.PHONY: pre-clean - -debian/scripts/fix-filenames: debian/scripts/fix-filenames.c - $(CC) -o $@ $^ - -clean:: pre-clean +clean: + ./debian/scripts/gen-rules + $(MAKE) -f debian/rules.gen clean %: - dh $@ - -# Ensure the directory prefix is exactly 100 characters long so pathnames are the -# exact same length in any binary files produced by the builds. These will be -# commonised later. -dkms_20d=.................... -dkms_100d=$(dkms_20d)$(dkms_20d)$(dkms_20d)$(dkms_20d)$(dkms_20d) -dkms_100c=$(shell echo '$(dkms_100d)' | sed -e 's/\./_/g') -#dkms_dir=$(shell echo '$(CURDIR)/$(dkms_100c)' | \ -# sed -e 's/\($(dkms_100d)\).*/\1/' -e 's/^\(.*\)....$$/\1dkms/') -define dkms_dir_prefix = -$(strip $(shell echo '$(1)/$(dkms_100c)' | \ - sed -e 's/\($(dkms_100d)\).*/\1/' -e 's/^\(.*\)....$$/\1dkms/')) -endef -dkms_dir=$(call dkms_dir_prefix,$(CURDIR)) - -define build_dkms = - $(SHELL) debian/scripts/dkms-build $(dkms_dir) $(1) --lrm $(2) $(3) $(4) $(5) $(6) -endef - -ifeq ($(arch),ppc64el) -instfile=vmlinux -else -instfile=vmlinuz -endif - -define install_control = - for which in $(5); \ - do \ - template="debian/templates/$(3).$$which.in"; \ - script="debian/$(1).$$which"; \ - sed -e 's/@abiname@/$(src_abi)/g' \ - -e 's/@localversion@/-$(2)/g' \ - -e 's/@image-stem@/$(instfile)/g' \ - -e 's/@nvidia-ver@/$(4)/g' \ - <"$$template" >"$$script"; \ - done -endef - -signatures=$(wildcard /usr/lib/linux/$(src_abi)-*) -flavours=$(patsubst /usr/lib/linux/$(src_abi)-%,nvidia-%,$(signatures)) - -nvidia-%: - rm -rf $(dkms_dir)/build $(dkms_dir)/source - mkdir -p $(dkms_dir)/build $(dkms_dir)/source - install -d debian/linux-modules-nvidia-390-$(src_abi)-$* - install -d debian/linux-modules-nvidia-390-$(src_abi)-$*/usr/lib/linux/triggers - $(call build_dkms, $(src_abi)-$*, linux-modules-nvidia-390-$(src_abi)-$*, $(CURDIR)/debian/linux-modules-nvidia-390-$(src_abi)-$*/lib/modules/$(src_abi)-$*/kernel, "", 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 install_control,linux-modules-nvidia-390-$(src_abi)-$*,$*,nvidia,390,postinst postrm prerm config templates) - - install -d debian/linux-modules-nvidia-450-$(src_abi)-$* - install -d debian/linux-modules-nvidia-450-$(src_abi)-$*/usr/lib/linux/triggers - $(call build_dkms, $(src_abi)-$*, linux-modules-nvidia-450-$(src_abi)-$*, $(CURDIR)/debian/linux-modules-nvidia-450-$(src_abi)-$*/lib/modules/$(src_abi)-$*/kernel, "", 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) - $(call install_control,linux-modules-nvidia-450-$(src_abi)-$*,$*,nvidia,450,postinst postrm prerm config templates) - - install -d debian/linux-modules-nvidia-455-$(src_abi)-$* - install -d debian/linux-modules-nvidia-455-$(src_abi)-$*/usr/lib/linux/triggers - $(call build_dkms, $(src_abi)-$*, linux-modules-nvidia-455-$(src_abi)-$*, $(CURDIR)/debian/linux-modules-nvidia-455-$(src_abi)-$*/lib/modules/$(src_abi)-$*/kernel, "", nvidia-455, pool/restricted/n/nvidia-graphics-drivers-455/nvidia-kernel-source-455_$(dkms_nvidia_455_version)_$(arch).deb pool/restricted/n/nvidia-graphics-drivers-455/nvidia-dkms-455_$(dkms_nvidia_455_version)_$(arch).deb) - $(call install_control,linux-modules-nvidia-455-$(src_abi)-$*,$*,nvidia,455,postinst postrm prerm config templates) - - install -d debian/linux-modules-nvidia-418-server-$(src_abi)-$* - install -d debian/linux-modules-nvidia-418-server-$(src_abi)-$*/usr/lib/linux/triggers - $(call build_dkms, $(src_abi)-$*, linux-modules-nvidia-418-server-$(src_abi)-$*, $(CURDIR)/debian/linux-modules-nvidia-418-server-$(src_abi)-$*/lib/modules/$(src_abi)-$*/kernel, "", 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 install_control,linux-modules-nvidia-418-server-$(src_abi)-$*,$*,nvidia,418srv,postinst postrm prerm config templates) - - install -d debian/linux-modules-nvidia-440-server-$(src_abi)-$* - install -d debian/linux-modules-nvidia-440-server-$(src_abi)-$*/usr/lib/linux/triggers - $(call build_dkms, $(src_abi)-$*, linux-modules-nvidia-440-server-$(src_abi)-$*, $(CURDIR)/debian/linux-modules-nvidia-440-server-$(src_abi)-$*/lib/modules/$(src_abi)-$*/kernel, "", 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 install_control,linux-modules-nvidia-440-server-$(src_abi)-$*,$*,nvidia,440srv,postinst postrm prerm config templates) - - install -d debian/linux-modules-nvidia-450-server-$(src_abi)-$* - install -d debian/linux-modules-nvidia-450-server-$(src_abi)-$*/usr/lib/linux/triggers - $(call build_dkms, $(src_abi)-$*, linux-modules-nvidia-450-server-$(src_abi)-$*, $(CURDIR)/debian/linux-modules-nvidia-450-server-$(src_abi)-$*/lib/modules/$(src_abi)-$*/kernel, "", 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) - $(call install_control,linux-modules-nvidia-450-server-$(src_abi)-$*,$*,nvidia,450srv,postinst postrm prerm config templates) - -prepare-dkms: - mkdir -p $(dkms_dir) - ln -s /usr/src $(dkms_dir)/headers - -override_dh_prep: debian/scripts/fix-filenames - dh_prep - -override_dh_auto_install: prepare-dkms $(flavours) - dh_install - -gencontrol_flags := -gencontrol_flags += -Vdkms:nvidia-390-modules="nvidia-dkms-390 (= $(dkms_nvidia_390_version))" -gencontrol_flags += -Vdkms:nvidia-450-modules="nvidia-dkms-450 (= $(dkms_nvidia_450_version))" -gencontrol_flags += -Vdkms:nvidia-455-modules="nvidia-dkms-455 (= $(dkms_nvidia_455_version))" -gencontrol_flags += -Vdkms:nvidia-418-server-modules="nvidia-dkms-418-server (= $(dkms_nvidia_418_server_version))" -gencontrol_flags += -Vdkms:nvidia-440-server-modules="nvidia-dkms-440-server (= $(dkms_nvidia_440_server_version))" -gencontrol_flags += -Vdkms:nvidia-450-server-modules="nvidia-dkms-450-server (= $(dkms_nvidia_450_server_version))" - -gencontrol_flags += -Vnvk:nvidia-390="nvidia-kernel-common-390 (<= $(nvidia_390_upstream_version)-1), nvidia-kernel-common-390 (>= $(nvidia_390_upstream_version))" -gencontrol_flags += -Vnvk:nvidia-450="nvidia-kernel-common-450 (<= $(nvidia_450_upstream_version)-1), nvidia-kernel-common-450 (>= $(nvidia_450_upstream_version))" -gencontrol_flags += -Vnvk:nvidia-455="nvidia-kernel-common-455 (<= $(nvidia_455_upstream_version)-1), nvidia-kernel-common-455 (>= $(nvidia_455_upstream_version))" -gencontrol_flags += -Vnvk:nvidia-418-server="nvidia-kernel-common-418-server (<= $(nvidia_418_server_upstream_version)-1), nvidia-kernel-common-418-server (>= $(nvidia_418_server_upstream_version))" -gencontrol_flags += -Vnvk:nvidia-440-server="nvidia-kernel-common-440-server (<= $(nvidia_440_server_upstream_version)-1), nvidia-kernel-common-440-server (>= $(nvidia_440_server_upstream_version))" -gencontrol_flags += -Vnvk:nvidia-450-server="nvidia-kernel-common-450-server (<= $(nvidia_450_server_upstream_version)-1), nvidia-kernel-common-450-server (>= $(nvidia_450_server_upstream_version))" - -override_dh_gencontrol: - dh_gencontrol -- $(gencontrol_flags) + $(MAKE) -f debian/rules.gen $@ diff --git a/debian/rules.in b/debian/rules.in new file mode 100755 index 0000000..31b7aeb --- /dev/null +++ b/debian/rules.in @@ -0,0 +1,139 @@ +#! /usr/bin/make -f + +##export DH_VERBOSE := 1 + +arch = $(shell dpkg-architecture -qDEB_HOST_ARCH) + +# Work out the source package name and version. The version +# is identical to this package less any rebuild suffix (+lrmN). +src_package := $(shell LC_ALL=C dpkg-parsechangelog -SSource) +src_fullversion = $(shell LC_ALL=C dpkg-parsechangelog -SVersion) +src_abi = $(shell echo "$(src_fullversion)" | sed -ne 's/\([0-9]*\.[0-9]*\.[0-9]*\-[0-9]*\)\..*/\1/p') +src_version = $(shell echo $(src_fullversion) | sed -e 's/+[0-9][0-9]*//') +src_series = $(shell dpkg-parsechangelog -SDistribution | sed -e 's/-\(security\|updates\|proposed\)$$//') +src_kernel = $(shell echo "$(src_package)" | sed -e 's/restricted-modules-//') + +# Get variants, assuming primary if debian/variants is not present +variants = -- +ifneq (,$(wildcard debian/variants)) + variants := $(shell cat debian/variants) +endif + +control_files := debian/control.common +# control files only wanted for the primary variant +primary_control_files := $(shell LC_ALL=C ls -d debian/control.d/transitionals-* 2>/dev/null) +ifneq ($(filter --, $(variants)),) + control_files += $(primary_control_files) +endif +control_files += $(filter-out $(primary_control_files),$(shell LC_ALL=C ls -d debian/control.d/*)) + +test:: + echo "$(src_fullversion) $(src_version)" + +# We build our control file. This has to be done before dh runs otherwise +# we have no binary files and we will not run the appropriate targets. +pre-clean: tp_key=test:provides\(-full\|-image\|-headers\|-modules-extra\) +pre-clean: $(control_files) + rm -f debian/control.tmp + for i in $^; do \ + if grep -q "{variant:" $$i; then \ + variant_first='yes'; \ + for variant in $(variants); do \ + variant="$$(echo "$$variant" | sed -e 's/--//')"; \ + sed \ + -e "s/\$${variant:suffix}/$$variant/g" \ + -e "s/\(\$${$(tp_key)[^}]*}\)/$${variant_first:+\1}/g" \ + <$$i; \ + echo ""; \ + variant_first=''; \ + done; \ + else \ + cat $$i; \ + echo ""; \ + fi; \ + done | sed \ + -e "/@BUILD-INTERLOCK@/{" \ + -e " r debian/control.gen" \ + -e " d" \ + -e " }" \ + | sed \ + -e "s/\(\$${$(tp_key)\([^}]*\)}\)/kernel-testing--$(src_kernel)-\1-\2,/g" \ + -e "s/@SRCPKGNAME@/$(src_package)/g" \ + -e "s/@ABI@/$(src_abi)/g" \ + -e "s/@VERSION@/$(src_version)/g" \ + -e "s/@SERIES@/$(src_series)/g" \ + >debian/control.tmp + rm -f debian/control + mv debian/control.tmp debian/control + rm -rf ./$(src_version) UNSIGNED SIGNED + rm -f debian/linux-modules-*.install \ + debian/linux-modules-*.preinst \ + debian/linux-modules-*.prerm \ + debian/linux-modules-*.postinst \ + debian/linux-modules-*.postrm + rm -rf $(dkms_dir) + +.PHONY: pre-clean + +debian/scripts/fix-filenames: debian/scripts/fix-filenames.c + $(CC) -o $@ $^ + +clean:: pre-clean + +%: + dh $@ + +# Ensure the directory prefix is exactly 100 characters long so pathnames are the +# exact same length in any binary files produced by the builds. These will be +# commonised later. +dkms_20d=.................... +dkms_100d=$(dkms_20d)$(dkms_20d)$(dkms_20d)$(dkms_20d)$(dkms_20d) +dkms_100c=$(shell echo '$(dkms_100d)' | sed -e 's/\./_/g') +#dkms_dir=$(shell echo '$(CURDIR)/$(dkms_100c)' | \ +# sed -e 's/\($(dkms_100d)\).*/\1/' -e 's/^\(.*\)....$$/\1dkms/') +define dkms_dir_prefix = +$(strip $(shell echo '$(1)/$(dkms_100c)' | \ + sed -e 's/\($(dkms_100d)\).*/\1/' -e 's/^\(.*\)....$$/\1dkms/')) +endef +dkms_dir=$(call dkms_dir_prefix,$(CURDIR)) + +define build_dkms = + $(SHELL) debian/scripts/dkms-build $(dkms_dir) $(1) --lrm $(2) $(3) $(4) $(5) $(6) +endef + +ifeq ($(arch),ppc64el) +instfile=vmlinux +else +instfile=vmlinuz +endif + +define install_control = + for which in $(5); \ + do \ + template="debian/templates/$(3).$$which.in"; \ + script="debian/$(1).$$which"; \ + sed -e 's/@abiname@/$(src_abi)/g' \ + -e 's/@localversion@/-$(2)/g' \ + -e 's/@image-stem@/$(instfile)/g' \ + -e 's/@nvidia-ver@/$(4)/g' \ + <"$$template" >"$$script"; \ + done +endef + +signatures=$(wildcard /usr/lib/linux/$(src_abi)-*) + +prepare-dkms: + mkdir -p $(dkms_dir) + ln -s /usr/src $(dkms_dir)/headers + +override_dh_prep: debian/scripts/fix-filenames + dh_prep + +override_dh_auto_install: prepare-dkms nvidia-$(arch) + dh_install + +override_dh_gencontrol: + dh_gencontrol -- $(gencontrol_flags) + +gencontrol_flags := + diff --git a/debian/scripts/gen-rules b/debian/scripts/gen-rules new file mode 100755 index 0000000..1a3fe02 --- /dev/null +++ b/debian/scripts/gen-rules @@ -0,0 +1,85 @@ +#!/bin/bash + +cat "debian/rules.in" >"debian/rules.gen" +: >"debian/control.d/meta-nvidia" +: >"debian/control.d/nvidia" + +while read command flavour archs +do + case "$command" in + build) ;; + *) continue ;; + esac + + targets=$(echo "$archs" | sed -e 's/\= \$(nvidia_${suffix_under}_upstream_version))\"" + echo "test::" + echo " @echo $package $version $suffix_minus $suffix_under $suffix_short $targets" + echo "$targets::" + echo " rm -rf \$(dkms_dir)/build \$(dkms_dir)/source" + echo " mkdir -p \$(dkms_dir)/build \$(dkms_dir)/source" + echo " install -d debian/linux-modules-nvidia-${suffix_minus}-\$(src_abi)-${flavour}" + echo " install -d debian/linux-modules-nvidia-${suffix_minus}-\$(src_abi)-${flavour}/usr/lib/linux/triggers" + echo " \$(call build_dkms, \$(src_abi)-${flavour}, linux-modules-nvidia-${suffix_minus}-\$(src_abi)-${flavour}, \$(CURDIR)/debian/linux-modules-nvidia-${suffix_minus}-\$(src_abi)-${flavour}/lib/modules/\$(src_abi)-${flavour}/kernel, \"\", nvidia-${suffix_short}, pool/restricted/n/nvidia-graphics-drivers-${suffix_minus}/nvidia-kernel-source-${suffix_minus}_\$(dkms_nvidia_${suffix_under}_version)_\$(arch).deb pool/restricted/n/nvidia-graphics-drivers-${suffix_minus}/nvidia-dkms-${suffix_minus}_\$(dkms_nvidia_${suffix_under}_version)_\$(arch).deb)" + echo " \$(call install_control,linux-modules-nvidia-${suffix_minus}-\$(src_abi)-${flavour},${flavour},nvidia,${suffix_short},postinst postrm prerm config templates)" + } >>"debian/rules.gen" + + # debian/control.d/meta-nvidia + cat - >>"debian/control.d/meta-nvidia" < +Architecture: ${archs} +Section: kernel +Provides: \${dkms:nvidia-${suffix_minus}-modules}, nvidia-prebuilt-kernel +Depends: + \${misc:Depends}, + linux-modules-nvidia-${suffix_minus}-@ABI@-${flavour} (= \${binary:Version}), + \${nvk:nvidia-${suffix_minus}} +Description: Extra drivers for nvidia-${suffix_minus} for the ${flavour}\${variant:suffix} flavour + Install extra signed nvidia-${suffix_minus} modules compatible with the ${flavour}\${variant:suffix} flavour. + +EOL + + # debian/control.d/nvidia + cat - >>"debian/control.d/nvidia" < +Architecture: ${archs} +Section: kernel +Priority: optional +Built-Using: \${linux:BuiltUsing} +Depends: + \${misc:Depends}, + \${shlibs:Depends}, + binutils, + linux-image-@ABI@-${flavour} | linux-image-unsigned-@ABI@-${flavour}, +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 + one of the linux-modules-nvidia-${suffix_minus}-${flavour}* meta-packages, + which will ensure that upgrades work correctly, and that supporting packages are + also installed. + +EOL + done <"debian/dkms-versions" +done <"debian/package.config" diff --git a/debian/source/options b/debian/source/options index 8e1f8cf..693e1f7 100644 --- a/debian/source/options +++ b/debian/source/options @@ -1,3 +1,6 @@ # force "dpkg-source -I -i" behavior diff-ignore tar-ignore +tar-ignore debian/control.d +tar-ignore debian/rules.gen +tar-ignore debian/control.gen From patchwork Fri Jan 22 16:23:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 1430430 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=) 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 4DMl1c1l8Yz9sVt; Sat, 23 Jan 2021 03:23:31 +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 1l2zDb-0004Gy-Ib; Fri, 22 Jan 2021 16:23:27 +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 1l2zDV-0004Ee-KK for kernel-team@lists.ubuntu.com; Fri, 22 Jan 2021 16:23:21 +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 1l2zDV-0006Xw-CU for kernel-team@lists.ubuntu.com; Fri, 22 Jan 2021 16:23:21 +0000 Received: by mail-ed1-f71.google.com with SMTP id r4so3165479eds.4 for ; Fri, 22 Jan 2021 08:23:21 -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:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7BzFmObV/w6FRJjPQGVdf6OtKO0WSQT6TNRWVlNoShU=; b=tl4Rj74E+cyaC+Z+tZIm3jKBmu+J5VJ2iJrFpK+2AH9jcjbxze+5u2zVrdTr2F8+dA 6S7kGzHMD+5ZAINQ/uSGfbqnmyJorOjapg0aVA1/guC5QXvtWJNtqOTkqkJ+osv9tow0 OrWYURwdGkYSqO0DOeBJIGW0mPi6HYQbX2Cbj1oWB5bWZiD8htWDIs0tUHS6nA+dwmRp KC9j/G60Rx5ux4XsaGe5W1SD7b3wvvfGw3euoW9VUlkxXLUodIg1WLRAGhZquszq478Q FTvVPTIzbwY7lfX9P/qJqf7gDUpjX4WiUhrOGHx020usYxcPFlwVKePMGxHl0BZIFcuH E04Q== X-Gm-Message-State: AOAM533UmYrxK1YdYOu0eUEoT8sf5wM2hBJ0k+zoL6dI7ohZXyjTl67f x31lmKK77Asf8vhp8W+IQFFWqplzspfDTjqYX+7gNYkXIAnlmonOaaaQlhq1Drw1SgzCZeDkOmN dVc3cl3E7qQasu9Qb+IVbfmczoeKw7mxAq9i5YNqnWQ== X-Received: by 2002:a17:906:c410:: with SMTP id u16mr3354519ejz.159.1611332600752; Fri, 22 Jan 2021 08:23:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJwyY5KvJmDCMvrv+LULbv6AdYHmF9FqVFfIHnoXEh+wKw48qvJbP1OMRv16mg0av2E5xNJHWQ== X-Received: by 2002:a17:906:c410:: with SMTP id u16mr3354505ejz.159.1611332600479; Fri, 22 Jan 2021 08:23:20 -0800 (PST) Received: from localhost ([2001:470:6973:2:cb60:1396:20d7:1932]) by smtp.gmail.com with ESMTPSA id n15sm4678283ejg.5.2021.01.22.08.23.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 08:23:19 -0800 (PST) From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/9] UBUNTU: [Packaging] generate nvidia version mappings at clean time -- add transitionals Date: Fri, 22 Jan 2021 16:23:04 +0000 Message-Id: <20210122162312.459010-4-apw@canonical.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210122162312.459010-1-apw@canonical.com> References: <20210122162312.459010-1-apw@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: Andy Whitcroft Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Signed-off-by: Andy Whitcroft --- debian/control.d/migrate-nvidia-435 | 13 ------ debian/control.d/migrate-nvidia-440 | 13 ------ debian/control.d/transitionals-oem-20.04 | 13 ------ debian/dkms-versions | 5 +-- debian/package.config | 2 + debian/scripts/gen-rules | 55 +++++++++++++++++++++++- 6 files changed, 58 insertions(+), 43 deletions(-) delete mode 100644 debian/control.d/migrate-nvidia-435 delete mode 100644 debian/control.d/migrate-nvidia-440 delete mode 100644 debian/control.d/transitionals-oem-20.04 diff --git a/debian/control.d/migrate-nvidia-435 b/debian/control.d/migrate-nvidia-435 deleted file mode 100644 index 35c343d..0000000 --- a/debian/control.d/migrate-nvidia-435 +++ /dev/null @@ -1,13 +0,0 @@ -Package: linux-modules-nvidia-435-generic${variant:suffix} -Architecture: amd64 -Section: oldlibs -Depends: linux-modules-nvidia-455-generic${variant:suffix} -Description: Extra drivers for nvidia-435 for the generic flavour (dummy transitional package) - Transitional package for upgrades of -435 to -455. - -Package: linux-modules-nvidia-435-lowlatency${variant:suffix} -Architecture: amd64 -Section: oldlibs -Depends: linux-modules-nvidia-455-lowlatency${variant:suffix} -Description: Extra drivers for nvidia-435 for the generic flavour (dummy transitional package) - Transitional package for upgrades of -435 to -455. diff --git a/debian/control.d/migrate-nvidia-440 b/debian/control.d/migrate-nvidia-440 deleted file mode 100644 index 29f3423..0000000 --- a/debian/control.d/migrate-nvidia-440 +++ /dev/null @@ -1,13 +0,0 @@ -Package: linux-modules-nvidia-440-generic${variant:suffix} -Architecture: amd64 -Section: oldlibs -Depends: linux-modules-nvidia-450-generic${variant:suffix} -Description: Extra drivers for nvidia-440 for the generic flavour (dummy transitional package) - Transitional package for upgrades of -440 to -450. - -Package: linux-modules-nvidia-440-lowlatency${variant:suffix} -Architecture: amd64 -Section: oldlibs -Depends: linux-modules-nvidia-450-lowlatency${variant:suffix} -Description: Extra drivers for nvidia-440 for the generic flavour (dummy transitional package) - Transitional package for upgrades of -440 to -450. diff --git a/debian/control.d/transitionals-oem-20.04 b/debian/control.d/transitionals-oem-20.04 deleted file mode 100644 index 4643b4f..0000000 --- a/debian/control.d/transitionals-oem-20.04 +++ /dev/null @@ -1,13 +0,0 @@ -Package: linux-modules-nvidia-440-oem-20.04 -Architecture: amd64 -Section: oldlibs -Depends: linux-modules-nvidia-450-generic -Description: Extra drivers for nvidia-440 for the generic flavour (dummy transitional package) - Transitional package for upgrades from 20.04 to 20.10. - -Package: linux-modules-nvidia-450-oem-20.04 -Architecture: amd64 -Section: oldlibs -Depends: linux-modules-nvidia-450-generic -Description: Extra drivers for nvidia-450 for the generic flavour (dummy transitional package) - Transitional package for upgrades from 20.04 to 20.10. diff --git a/debian/dkms-versions b/debian/dkms-versions index a8f8e9b..b119726 100644 --- a/debian/dkms-versions +++ b/debian/dkms-versions @@ -1,8 +1,7 @@ zfs-linux 0.8.4-1ubuntu11 nvidia-graphics-drivers-390 390.138-0ubuntu2 -nvidia-graphics-drivers-435 435.21-0ubuntu8 -nvidia-graphics-drivers-450 450.80.02-0ubuntu1 -nvidia-graphics-drivers-455 455.38-0ubuntu0.20.10.1 +nvidia-graphics-drivers-450 450.80.02-0ubuntu1 transition=nvidia-graphics-drivers-440 +nvidia-graphics-drivers-455 455.38-0ubuntu0.20.10.1 transition=nvidia-graphics-drivers-435 nvidia-graphics-drivers-418-server 418.152.00-0ubuntu2 nvidia-graphics-drivers-440-server 440.95.01-0ubuntu2 nvidia-graphics-drivers-450-server 450.80.02-0ubuntu3 diff --git a/debian/package.config b/debian/package.config index 2b69799..86c0e19 100644 --- a/debian/package.config +++ b/debian/package.config @@ -1,2 +1,4 @@ build generic amd64 build lowlatency amd64 +transitional 440-oem-20.04 450-generic amd64 +transitional 450-oem-20.04 450-generic amd64 diff --git a/debian/scripts/gen-rules b/debian/scripts/gen-rules index 1a3fe02..2b7a177 100755 --- a/debian/scripts/gen-rules +++ b/debian/scripts/gen-rules @@ -1,8 +1,11 @@ #!/bin/bash +mkdir -p "debian/control.d" cat "debian/rules.in" >"debian/rules.gen" : >"debian/control.d/meta-nvidia" : >"debian/control.d/nvidia" +: >"debian/control.d/migrate-nvidia" +: >"debian/control.d/transitionals-local" while read command flavour archs do @@ -13,7 +16,12 @@ do targets=$(echo "$archs" | sed -e 's/\>"debian/control.gen" <= @VERSION@), + linux-buildinfo-@ABI@-${flavour} [${archs}] (>= @VERSION@), +EOL + + while read package version extra do case "$package" in nvidia-graphics-drivers-*) ;; @@ -24,6 +32,8 @@ do suffix_under=$(echo "$suffix_minus" | sed -e 's/-/_/g') suffix_short=$(echo "$suffix_minus" | sed -e 's/-server/srv/g') + echo "II: build $package for $flavour $archs" + # debian/rules.gen { echo "" @@ -81,5 +91,48 @@ Description: Linux kernel nvidia modules for version @ABI@ also installed. EOL + # debian/control.d/migrate-nvidia + for cmd in $extra + do + case "$cmd" in + transition=*) + from="${cmd#transition=}" + from_minus=$(echo "$from" | sed -e 's/nvidia-graphics-drivers-//') + echo "II: general transition $from -> $package ($from_minus -> $suffix_minus)" + cat - >>"debian/control.d/migrate-nvidia" < linux-modules-nvidia-$to" + cat - >>"debian/control.d/transitionals-local" < X-Patchwork-Id: 1430432 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=) 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 4DMl1j67TVz9sS8; Sat, 23 Jan 2021 03:23: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 1l2zDg-0004LC-QN; Fri, 22 Jan 2021 16:23:32 +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 1l2zDX-0004Ez-1Q for kernel-team@lists.ubuntu.com; Fri, 22 Jan 2021 16:23:23 +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 1l2zDW-0006Y3-N0 for kernel-team@lists.ubuntu.com; Fri, 22 Jan 2021 16:23:22 +0000 Received: by mail-ed1-f71.google.com with SMTP id y6so3166646edc.17 for ; Fri, 22 Jan 2021 08:23:22 -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:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zCrQ06hKIYzOp6p6I0KjJXAp8n6d3xUYX3QhUpYpodQ=; b=Io1Tvd71ei3SXpJX6YmQ1WL/ftf95HzK1GXGZOoL8edDvAcTOqsmkYofooz2t7qjOi EmZYXgeeCKFq2ibcP2+ZXA0BAqMAmr2fUYye0Tm1iD7yMhgJiNsD6cTgX0v4YP18KSJQ EGyhAuiDtbw48tg+ZLDwKQfHHqHB7CBqU6TBAG5PXOPNd+DHFtNR3dHEnoYzonAv4kaS XFdkhwjrMm17dG1qOO7uEKo6/jAWlktKClkq1lwAjMtSAWGsTAP81OBmsycoj7o0p8cW f7O4JAx8OxqPnSDukMGsk1Y9sELHrvIN/Iae1bmBKKj7aeAC2KX2uZjim2yuixo9rIeq dJMg== X-Gm-Message-State: AOAM531nf0l0KthjQkRfh/g9G2tLcVHjTJmUytB7bwv+L5zR9UugeB12 gtjPc5RwsHdj26TI8L/VhP6DGckh4YeO2g5iLaWu0Ozp0EEwTlR6XM2DnKiOOLvH1CXEqqOXZhr sByjKlRErD0a0JzjOeIMuLqZl50sh/2cHz6NHIvWs+A== X-Received: by 2002:a17:906:1796:: with SMTP id t22mr3342590eje.372.1611332602171; Fri, 22 Jan 2021 08:23:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJxqQz8MjU6C3uv4iXgHSPKiJ2RbBgwlSTp1XGqTsmIGVFBpNtK12NVCCuO27Oiuv+0nnDVyvw== X-Received: by 2002:a17:906:1796:: with SMTP id t22mr3342581eje.372.1611332601973; Fri, 22 Jan 2021 08:23:21 -0800 (PST) Received: from localhost ([2001:470:6973:2:cb60:1396:20d7:1932]) by smtp.gmail.com with ESMTPSA id i13sm5710660edu.22.2021.01.22.08.23.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 08:23:21 -0800 (PST) From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [PATCH 3/9] UBUNTU: [Packaging] generate nvidia version mappings at clean time -- handle Build-Depends Date: Fri, 22 Jan 2021 16:23:05 +0000 Message-Id: <20210122162312.459010-5-apw@canonical.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210122162312.459010-1-apw@canonical.com> References: <20210122162312.459010-1-apw@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: Andy Whitcroft Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Signed-off-by: Andy Whitcroft --- debian/control.common | 5 +---- debian/scripts/gen-rules | 5 +++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/debian/control.common b/debian/control.common index f877453..024f702 100644 --- a/debian/control.common +++ b/debian/control.common @@ -11,9 +11,6 @@ Build-Depends: dkms, curl, gawk, - linux-headers-@ABI@-generic (>= @VERSION@), - linux-headers-@ABI@-lowlatency (>= @VERSION@), - linux-buildinfo-@ABI@-generic (>= @VERSION@), - linux-buildinfo-@ABI@-lowlatency (>= @VERSION@), + @BUILD-INTERLOCK@ Standards-Version: 3.9.4 Vcs-Git: git://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux-restricted-modules/+git/@SERIES@ diff --git a/debian/scripts/gen-rules b/debian/scripts/gen-rules index 2b7a177..f52697d 100755 --- a/debian/scripts/gen-rules +++ b/debian/scripts/gen-rules @@ -2,6 +2,7 @@ mkdir -p "debian/control.d" cat "debian/rules.in" >"debian/rules.gen" +: >"debian/control.gen" : >"debian/control.d/meta-nvidia" : >"debian/control.d/nvidia" : >"debian/control.d/migrate-nvidia" @@ -17,8 +18,8 @@ do targets=$(echo "$archs" | sed -e 's/\>"debian/control.gen" <= @VERSION@), - linux-buildinfo-@ABI@-${flavour} [${archs}] (>= @VERSION@), + linux-headers-@ABI@-${flavour} (>= @VERSION@) [${archs}], + linux-buildinfo-@ABI@-${flavour} (>= @VERSION@) [${archs}], EOL while read package version extra From patchwork Fri Jan 22 16:23:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 1430429 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=) 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 4DMl1c1Rq6z9sVr; Sat, 23 Jan 2021 03:23:31 +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 1l2zDb-0004HE-QS; Fri, 22 Jan 2021 16:23:27 +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 1l2zDY-0004Fa-M7 for kernel-team@lists.ubuntu.com; Fri, 22 Jan 2021 16:23:24 +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 1l2zDY-0006YC-Ei for kernel-team@lists.ubuntu.com; Fri, 22 Jan 2021 16:23:24 +0000 Received: by mail-ed1-f71.google.com with SMTP id m16so3143513edd.21 for ; Fri, 22 Jan 2021 08:23:24 -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:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Tvn4eGMfkFI676sXVLM643hNcuHwHicFKvk27+AVRUQ=; b=UvB883LUHhnrSfwKX8j/Fx38twX8eXGMBaUCYmSpxwMpjzAORPRC81GOSXraGgDIij LdhS7uOyW0Fzku+ZBzg7ri689JyvQyDUUo2AzzIqTMNT2i3aR30Rx2NmtXBijhCDFuby 8SOyHI34YpALPHrDvyj/r3RaMu3xENEaz5V7MYkQuthRuLFhmgl5aCyi2vmqBxNl2BUo wn7mPpMvuwQBiVgPOji5PgI549cRk/aPJgY0vytYD6IgOHpBnFD2bCHivtFOZJWSgYk1 vK74JQ1NTBSkN+d1LD4FCURpEliNwEEqJSJPF3OKfvoXV+at+fNldaDhY6MNRfJQToxJ ydxA== X-Gm-Message-State: AOAM532tt4i7ARHNKjJ8grTDwNseGHNEH7l39C4yRIsgOI5dhfEyMAYa oAV2mIkLVf20XkKDa34vM1LTd4Z+/aDUofRi0m2x4Yf66+N3AHBUPOKrcK4eYuMcmy3SQTNgaD/ KhyjPskEukLnDLiMf8nBR3Db0xt+4VHOEidiaxRgnew== X-Received: by 2002:a05:6402:26c9:: with SMTP id x9mr3794793edd.365.1611332603774; Fri, 22 Jan 2021 08:23:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJxJxDZ1hl0aWMxBHxwZbO8VJUGJRnHlWR+WNkBM2YjgjW5N7BlLsrpuojpo4GMF1/npzZGTbA== X-Received: by 2002:a05:6402:26c9:: with SMTP id x9mr3794783edd.365.1611332603585; Fri, 22 Jan 2021 08:23:23 -0800 (PST) Received: from localhost ([2001:470:6973:2:cb60:1396:20d7:1932]) by smtp.gmail.com with ESMTPSA id w6sm4696604ejj.116.2021.01.22.08.23.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 08:23:23 -0800 (PST) From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [PATCH 4/9] UBUNTU: [Packaging] generate nvidia version mappings at clean time -- use Build-Depends-Arch Date: Fri, 22 Jan 2021 16:23:06 +0000 Message-Id: <20210122162312.459010-6-apw@canonical.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210122162312.459010-1-apw@canonical.com> References: <20210122162312.459010-1-apw@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: Andy Whitcroft Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Signed-off-by: Andy Whitcroft --- debian/control.common | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control.common b/debian/control.common index 024f702..fa5b96d 100644 --- a/debian/control.common +++ b/debian/control.common @@ -4,6 +4,7 @@ Priority: optional Maintainer: Canonical Kernel Team Build-Depends: debhelper (>= 9), +Build-Depends-Arch: lsb-release, python3, python3-apt, From patchwork Fri Jan 22 16:23:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 1430431 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=) 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 4DMl1c3x6mz9sVm; Sat, 23 Jan 2021 03:23:32 +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 1l2zDc-0004Hl-2j; Fri, 22 Jan 2021 16:23: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 1l2zDa-0004Fz-65 for kernel-team@lists.ubuntu.com; Fri, 22 Jan 2021 16:23:26 +0000 Received: from mail-ed1-f72.google.com ([209.85.208.72]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1l2zDZ-0006YQ-V0 for kernel-team@lists.ubuntu.com; Fri, 22 Jan 2021 16:23:25 +0000 Received: by mail-ed1-f72.google.com with SMTP id g14so3185980edt.12 for ; Fri, 22 Jan 2021 08:23:25 -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:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6/3vrNCgbbdHi5LINVXZ6BgdxdiC+opd5K2NEPvQnUI=; b=bgqo0on31U/caHAVzwO+NO74PxmwJsI8MO3imJ3X7UJcNREXvcqIYc5xrHPG2zzAp1 p3UDrJinVn7rmK2N2DAua6esSyFf066rXStOmkow1DTwh2WlArgu9cddBh87x+b2cppD 6hgaqn/vX68lT9UMSXRJkHhbxncVIT590yXz18Qtu5qTB/A4peLcVXTs/GE3dy1R4LKU LxT37hCQYI0jRDeIV4K/mt6t1RvDbRWB44hTtsTSnGNyMHnQxMtz6wH4R+NsavTm2LFA FowPfdBzEWrNqFEWyv584LB/lgrhkeqkmVSOhbgbbucU6GFdY38EGlW4ZFczteRBKlUB GUlg== X-Gm-Message-State: AOAM532N/JeTG2+bGT8xup9a2OVmOGWA16CViRJflMmHxeJmGmoT21oy LhHtOldq0ocbmD7Parf8NLGWfpqlyLjXsRiSYV/pCfOkuqbWrCOo+EsDdAWc4Bxb32bdL1j3LEi 7RiY1WGp0S4guvT63Lt7A0m+dIMenIXUJTozRCcnyhw== X-Received: by 2002:a17:906:11d6:: with SMTP id o22mr3610985eja.106.1611332605284; Fri, 22 Jan 2021 08:23:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJwvPnH6RxoDPM0UVQIdLxRaIP+dZ9+KtV6+X1QII0Ri55nqG25vbXvz15fBzv3b5L+g8X6N+g== X-Received: by 2002:a17:906:11d6:: with SMTP id o22mr3610979eja.106.1611332605058; Fri, 22 Jan 2021 08:23:25 -0800 (PST) Received: from localhost ([2001:470:6973:2:cb60:1396:20d7:1932]) by smtp.gmail.com with ESMTPSA id u9sm4726568ejc.57.2021.01.22.08.23.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 08:23:24 -0800 (PST) From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [PATCH 5/9] UBUNTU: [Packaging] generate nvidia version mappings at clean time -- add signonly Date: Fri, 22 Jan 2021 16:23:07 +0000 Message-Id: <20210122162312.459010-7-apw@canonical.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210122162312.459010-1-apw@canonical.com> References: <20210122162312.459010-1-apw@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: Andy Whitcroft Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Signed-off-by: Andy Whitcroft --- debian/scripts/gen-rules | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debian/scripts/gen-rules b/debian/scripts/gen-rules index f52697d..4ea032c 100755 --- a/debian/scripts/gen-rules +++ b/debian/scripts/gen-rules @@ -29,6 +29,10 @@ EOL *) continue ;; esac + case " $extra " in + *\ signonly\ *) continue ;; + esac + suffix_minus=$(echo "$package" | sed -e 's/nvidia-graphics-drivers-//') suffix_under=$(echo "$suffix_minus" | sed -e 's/-/_/g') suffix_short=$(echo "$suffix_minus" | sed -e 's/-server/srv/g') From patchwork Fri Jan 22 16:23:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 1430433 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=) 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 4DMl1n055mz9sCD; Sat, 23 Jan 2021 03:23:41 +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 1l2zDj-0004NE-BQ; Fri, 22 Jan 2021 16:23:35 +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 1l2zDb-0004HA-TC for kernel-team@lists.ubuntu.com; Fri, 22 Jan 2021 16:23:27 +0000 Received: from mail-ej1-f72.google.com ([209.85.218.72]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1l2zDb-0006YY-II for kernel-team@lists.ubuntu.com; Fri, 22 Jan 2021 16:23:27 +0000 Received: by mail-ej1-f72.google.com with SMTP id z2so2393376ejf.3 for ; Fri, 22 Jan 2021 08:23:27 -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:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RhXeOOKsBAIm+Tj9zRVOLMTIoGlmsl2VTwiQnhYylVU=; b=q6flHWMlp7+MAmV3rc8pxDwUaImlcBDdlY4DeygBQmmhA3eDAPyzZNxysprqTaHswt HpIm45zw+opsOFLXbfrn+hBszKldwhaRkRfAfuT7Ully1sq4HpcRKyUmbNjmSNwnevtb C9h8zVV5N886zJdrM72wTJLhCaP6FiOADmYkyjQIXJyZL9vbWfGjCMHy2IwVngT+TrnI GX8cQQ+jAiuCRvgrxB5fi3ye2i/XmqNgeTEx64BSU6PYcESQBEkdSa/QdZQC97OJk7ne ghDwRn1m1Cooe+i+3NfbD9FK7QjcHjyPcVGRs+Yzs0xBht8LM1Z9grSkY1sP4pA42oo7 b3XQ== X-Gm-Message-State: AOAM5322b3Pw7mz/4VEhi+hDPjMDw5kyL0sAhs76aDtXKt01y8Kocro2 lJswcscJqNbH0LNeyQnKPrhv7fDcyC0sLt93KwLhbURUGK/RlmE12t9BZbwe3l0xTqHKbF28UD9 QtHWKEgcwoHEcyqyA70Q8yahVj93o6WvZ2aKErjacug== X-Received: by 2002:aa7:dd16:: with SMTP id i22mr253544edv.215.1611332606898; Fri, 22 Jan 2021 08:23:26 -0800 (PST) X-Google-Smtp-Source: ABdhPJxd+GKks08Lirdqe1rB6oxtnS6QUmSZ5Ci9VOsTbiTuEnRs0rzlhnnL1vnwl15Q9pys9FaqPw== X-Received: by 2002:aa7:dd16:: with SMTP id i22mr253532edv.215.1611332606665; Fri, 22 Jan 2021 08:23:26 -0800 (PST) Received: from localhost ([2001:470:6973:2:cb60:1396:20d7:1932]) by smtp.gmail.com with ESMTPSA id v25sm4770656ejw.21.2021.01.22.08.23.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 08:23:26 -0800 (PST) From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [PATCH 6/9] UBUNTU: [Packaging] generate nvidia version mappings at clean time -- handle +21.04.1 Date: Fri, 22 Jan 2021 16:23:08 +0000 Message-Id: <20210122162312.459010-8-apw@canonical.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210122162312.459010-1-apw@canonical.com> References: <20210122162312.459010-1-apw@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: Andy Whitcroft Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Make version handling compatible with hirsute backport-forward versioning. Signed-off-by: Andy Whitcroft --- debian/rules.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules.in b/debian/rules.in index 31b7aeb..16033cb 100755 --- a/debian/rules.in +++ b/debian/rules.in @@ -9,7 +9,7 @@ arch = $(shell dpkg-architecture -qDEB_HOST_ARCH) src_package := $(shell LC_ALL=C dpkg-parsechangelog -SSource) src_fullversion = $(shell LC_ALL=C dpkg-parsechangelog -SVersion) src_abi = $(shell echo "$(src_fullversion)" | sed -ne 's/\([0-9]*\.[0-9]*\.[0-9]*\-[0-9]*\)\..*/\1/p') -src_version = $(shell echo $(src_fullversion) | sed -e 's/+[0-9][0-9]*//') +src_version = $(shell echo $(src_fullversion) | sed -e 's/+[0-9][0-9]*$$//') src_series = $(shell dpkg-parsechangelog -SDistribution | sed -e 's/-\(security\|updates\|proposed\)$$//') src_kernel = $(shell echo "$(src_package)" | sed -e 's/restricted-modules-//') From patchwork Fri Jan 22 16:23:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 1430434 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=) 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 4DMl1p07nXz9sVF; Sat, 23 Jan 2021 03:23:42 +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 1l2zDl-0004P5-Mh; Fri, 22 Jan 2021 16:23:37 +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 1l2zDe-0004Il-G5 for kernel-team@lists.ubuntu.com; Fri, 22 Jan 2021 16:23:30 +0000 Received: from mail-ej1-f71.google.com ([209.85.218.71]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1l2zDc-0006Yf-PS for kernel-team@lists.ubuntu.com; Fri, 22 Jan 2021 16:23:28 +0000 Received: by mail-ej1-f71.google.com with SMTP id h18so2388682ejx.17 for ; Fri, 22 Jan 2021 08:23: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:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wVbjxwnN0M2+A3hTk8G+IjsX3Wk9KRUqfEU+kd1t+g0=; b=mnyV4qB7BMl7ABP0I02dM3OEYOKunWLJeOHdEuA2rZ+0eERX2m+zBq3vZBojBPed+S VAR/hgArZDEn6WL7DL6Pn7mLXxzeeMO0ierDzocOp8Shh6UJKjRO13LOI3Pq8iOPsjvU 5spqG3h5EfTyafAjPtOgqbhdnBJro+zP+yrs/A7zCtlzuF2G6Iv6prZBKcfFHvuO/uO+ K1wY00OjFSbnKehrTY6xXh91dTrZIdzKapRVvVWhtQiP7mAE9P705uY4rMBO7JPiRxUl GglaB35iKise1Xwj8yfA5eDE3dXsV6zOkQm0/BEGGomSBem9CK2E/oXbpPs+eIjsQLmb I4qQ== X-Gm-Message-State: AOAM531RiOEeDyh6G7VxDV6ryDrp7AVmlwaR7vkM+AzAPq4jYJ5A1KT4 cl/C5g9EruoSKBUZtSHPhUPQ138MzSzCNShn2QOxW5kupX7mFFzVkVJfHP3v2aWdtkwpQXBkD7g UlMwcIBcalt9DjcoHeB6rW37OUap8rktbXbJ/0YlnRQ== X-Received: by 2002:a17:906:d8b4:: with SMTP id qc20mr3571481ejb.451.1611332608265; Fri, 22 Jan 2021 08:23:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJzbfMJ4cshOPkerdOfr0qUab8CXlzMqCnD/7ve7uHCpbeMG7j4JJvF+5ztC01RczRa+EsPoqA== X-Received: by 2002:a17:906:d8b4:: with SMTP id qc20mr3571472ejb.451.1611332608084; Fri, 22 Jan 2021 08:23:28 -0800 (PST) Received: from localhost ([2001:470:6973:2:cb60:1396:20d7:1932]) by smtp.gmail.com with ESMTPSA id z6sm4803461ejx.17.2021.01.22.08.23.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 08:23:27 -0800 (PST) From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [PATCH 7/9] UBUNTU: [Packaging] generate nvidia version mappings at clean time -- add options Date: Fri, 22 Jan 2021 16:23:09 +0000 Message-Id: <20210122162312.459010-9-apw@canonical.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210122162312.459010-1-apw@canonical.com> References: <20210122162312.459010-1-apw@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: Andy Whitcroft Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Signed-off-by: Andy Whitcroft --- debian/scripts/gen-rules | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/debian/scripts/gen-rules b/debian/scripts/gen-rules index 4ea032c..710771a 100755 --- a/debian/scripts/gen-rules +++ b/debian/scripts/gen-rules @@ -8,6 +8,21 @@ cat "debian/rules.in" >"debian/rules.gen" : >"debian/control.d/migrate-nvidia" : >"debian/control.d/transitionals-local" +nvidia_desktop= +nvidia_server= +while read command arg +do + case "$command" in + option) ;; + *) continue ;; + esac + + case "$arg" in + desktop) nvidia_desktop=y ;; + server) nvidia_server=y ;; + esac +done <"debian/package.config" + while read command flavour archs do case "$command" in @@ -25,7 +40,12 @@ EOL while read package version extra do case "$package" in - nvidia-graphics-drivers-*) ;; + nvidia-graphics-drivers-*-server) + [ -z "$nvidia_server" ] && continue + ;; + nvidia-graphics-drivers-*) + [ -z "$nvidia_desktop" ] && continue + ;; *) continue ;; esac From patchwork Fri Jan 22 16:23:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 1430435 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=) 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 4DMl1s1LMyz9sS8; Sat, 23 Jan 2021 03:23:45 +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 1l2zDo-0004RA-Bv; Fri, 22 Jan 2021 16:23:40 +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 1l2zDf-0004JT-IW for kernel-team@lists.ubuntu.com; Fri, 22 Jan 2021 16:23:31 +0000 Received: from mail-ed1-f72.google.com ([209.85.208.72]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1l2zDe-0006Yy-9x for kernel-team@lists.ubuntu.com; Fri, 22 Jan 2021 16:23:30 +0000 Received: by mail-ed1-f72.google.com with SMTP id f21so3169626edx.23 for ; Fri, 22 Jan 2021 08:23:30 -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:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3s1DEuaMm3T3Ffk2I7s/EWrljlskldUmlxGt30AGYKw=; b=iepCpJ0bKqRsZb4A9CTrbh94LOUzICPZ1kGRnaWTRdSsF10xGM+zDOzVA61OXpXa9K rNioITXUWKOy7y2zMXAHx4+2QKQTsR343avNVCyPDoOpiS0vFc543v7lBisYI/CCByLY JWVX6zmRrHnJsdRGbpfxW3BqMx2iaqShDcf65y5lLK9D4kEzu/zduWPcttygWGEWz2D+ uI77REpuo1DSo3J7fKaNpHGBQz3USCtpAL2pjmKXUqmMgYtzQXtco8cThkb5UDG8FQpC iY7wPFwtrVVBFwmDUDYJnN7ITFKUYy8Goe8vlCXCQK+E9zP95Za5tTL1SFHcPY8cJSvq PKBA== X-Gm-Message-State: AOAM530wTltvyjaKpkOFHglli2TZZJGpImGmSFmGU/oQpX7HLTHjQg71 O0syouVqnoC+HKwxoEGiiOu/Lpfm80oyZqEVPUMYcta8x3VvFJ1ydvIApc5G0eRME5T7IuTXlKM DTO7ssfliaGdsbYfJIfJ1IsmLvRk7wr9cfpwv10oBFg== X-Received: by 2002:a05:6402:b07:: with SMTP id bm7mr3912495edb.104.1611332609637; Fri, 22 Jan 2021 08:23:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJxyyYxqivX4W87YH0+xfhQutui2o1hcG2NrZrd3sSPC4309YRLtq7XEvLCJgcUu0/QCUA100g== X-Received: by 2002:a05:6402:b07:: with SMTP id bm7mr3912484edb.104.1611332609469; Fri, 22 Jan 2021 08:23:29 -0800 (PST) Received: from localhost ([2001:470:6973:2:cb60:1396:20d7:1932]) by smtp.gmail.com with ESMTPSA id m26sm4720324ejr.54.2021.01.22.08.23.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 08:23:28 -0800 (PST) From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [PATCH 8/9] UBUNTU: [Packaging] generate nvidia version mappings at clean time -- handle old dkms-build API Date: Fri, 22 Jan 2021 16:23:10 +0000 Message-Id: <20210122162312.459010-10-apw@canonical.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210122162312.459010-1-apw@canonical.com> References: <20210122162312.459010-1-apw@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: Andy Whitcroft Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Signed-off-by: Andy Whitcroft --- debian/scripts/gen-rules | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/debian/scripts/gen-rules b/debian/scripts/gen-rules index 710771a..fb8717e 100755 --- a/debian/scripts/gen-rules +++ b/debian/scripts/gen-rules @@ -8,6 +8,11 @@ cat "debian/rules.in" >"debian/rules.gen" : >"debian/control.d/migrate-nvidia" : >"debian/control.d/transitionals-local" +dkms_build_new=$(grep -c 'shift 7' debian/scripts/dkms-build) +if [ "$dkms_build_new" -eq 0 ]; then + sed -i -e '/debian\/scripts\/dkms-build/s/ $(4)//' debian/rules.gen +fi + nvidia_desktop= nvidia_server= while read command arg From patchwork Fri Jan 22 16:23:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 1430436 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=) 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 4DMl1w6SdLz9sS8; Sat, 23 Jan 2021 03:23:48 +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 1l2zDr-0004T5-C0; Fri, 22 Jan 2021 16:23:43 +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 1l2zDg-0004KZ-9A for kernel-team@lists.ubuntu.com; Fri, 22 Jan 2021 16:23:32 +0000 Received: from mail-ej1-f72.google.com ([209.85.218.72]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1l2zDf-0006ZB-MT for kernel-team@lists.ubuntu.com; Fri, 22 Jan 2021 16:23:31 +0000 Received: by mail-ej1-f72.google.com with SMTP id d15so2371280ejc.21 for ; Fri, 22 Jan 2021 08:23:31 -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:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=J/tydVLSEGpdyIbljnu7+T1A4qwffJZa0VQQkzm0cSg=; b=Argi/Q/WKIxlKLzsvy6eFUl19lh9X+8hea64hpaiMKyr5ZNgbEvcRVdalS+kK0/pT8 G49EkNXg9QfDY2ToQwImMTqoTYvqJ2d2yjtABVoGx4d7rewET0TQXV3RU4i5yJ6ZFvPm J/kjmmcd73nO+CV6tSyioH1E2KNo91w1UH4MvwCXxo+U/DfdRFhuOuwYAFuMO+tKKq5G x/JR2gqUtY3Eok+r7kV/1OaQetuhpk1EI4M+TP9ORLZkECg4cpsYuD77Aw6SpwmCmrn+ md7qNGMoiTQdhrEbQVzxQhnXA71yJHGQowzUhitTqbmG2Nv3PbmHXkr/VmPOf6UoiZZJ UUOg== X-Gm-Message-State: AOAM531Vrg5WnueV19lYgdELMnz0zVtGJ2ocl7moZZ4wGtfdIh5QBKZm voi/077j3CGfH5gFBQulESyrJEXl6XByWBm7uGavN9gKSTrNk0E1HIyFf652cb3uDrz9hQvVs6G 10V29w1iPHwBA2eJQDWddXIKesWAiLaM4roeOtovIxw== X-Received: by 2002:a17:906:6b08:: with SMTP id q8mr3488980ejr.391.1611332611199; Fri, 22 Jan 2021 08:23:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJyyBDU4dlvbFKJNxOIgYPyMTSRcS5EnFTP0Npmo15RAg4defPAjDgu4HRBg9j4oNpgcd7pscw== X-Received: by 2002:a17:906:6b08:: with SMTP id q8mr3488968ejr.391.1611332611017; Fri, 22 Jan 2021 08:23:31 -0800 (PST) Received: from localhost ([2001:470:6973:2:cb60:1396:20d7:1932]) by smtp.gmail.com with ESMTPSA id i22sm4691738ejx.77.2021.01.22.08.23.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jan 2021 08:23:30 -0800 (PST) From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [PATCH 9/9] UBUNTU: [Packaging] generate nvidia version mappings at clean time -- add suppress support Date: Fri, 22 Jan 2021 16:23:11 +0000 Message-Id: <20210122162312.459010-11-apw@canonical.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210122162312.459010-1-apw@canonical.com> References: <20210122162312.459010-1-apw@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: Andy Whitcroft Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Signed-off-by: Andy Whitcroft --- debian/scripts/gen-rules | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/debian/scripts/gen-rules b/debian/scripts/gen-rules index fb8717e..19830c0 100755 --- a/debian/scripts/gen-rules +++ b/debian/scripts/gen-rules @@ -15,10 +15,12 @@ fi nvidia_desktop= nvidia_server= +nvidia_ignore= while read command arg do case "$command" in option) ;; + suppress) nvidia_ignore="$nvidia_ignore $arg"; continue ;; *) continue ;; esac @@ -53,6 +55,9 @@ EOL ;; *) continue ;; esac + case " $nvidia_ignore " in + *\ $package\ *) continue ;; + esac case " $extra " in *\ signonly\ *) continue ;;