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" <