From patchwork Thu Apr 14 21:21:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1617464 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4KfXTP2S2Gz9sGS for ; Fri, 15 Apr 2022 07:21:44 +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 1nf6uF-0008Bb-Ld; Thu, 14 Apr 2022 21:21:35 +0000 Received: from mail-pf1-f170.google.com ([209.85.210.170]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nf6uD-00089J-Bx for kernel-team@lists.ubuntu.com; Thu, 14 Apr 2022 21:21:33 +0000 Received: by mail-pf1-f170.google.com with SMTP id n43so1923018pfv.10 for ; Thu, 14 Apr 2022 14:21:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CavV8iD4RsZAgIPa07xCfpKLU1H84hZ6RzR4enyWWuM=; b=8FacxMZpaaGH3/VhuTdSPu0VIEcm9RaUE0fW9vP7rY6SnB8KeNMS2onj2uDyJ6ex9a 6j8hvbvn7kQgpAGjn3nK3C1fax+PhC3sUmHSWep2+/mX0r7o5DiOqFqNNUVWPfUkUegp rOTTxFqBzv2c905ZIUHd/m+kW4/j9jXD/21bqky0fJFd08/e0u25TWJhFrsh7T8V7hJA kPYhZbiTs4w5XOVwD1d2QQROiWEXzI9LcMytmGDvsN6OZDDOH9IPFjOYfEnWDCNaDo7m l/A/6cpjOdhu0oXy5briaGLW9wYqwxUn7T/jREEC0TRukO5Nonurj1KofYmaGMEkwlLz Kv7A== X-Gm-Message-State: AOAM533GX1xrONvQtIew5i9Dx4NeM8E4/dokruPx8QdJkk4zqaBna1Eq 4PuK1+wpRYd35Y4K3cyOLFJ8bpzQcgY= X-Google-Smtp-Source: ABdhPJxmtfj+ix5AkfS/bWFaeCZFbSRVexJ2AAFlSGvjSSroeqgk4w6B1VYjVAQZKOUypgxsMHNv2Q== X-Received: by 2002:a05:6a00:1903:b0:4fa:fa9e:42e6 with SMTP id y3-20020a056a00190300b004fafa9e42e6mr5791191pfi.1.1649971291193; Thu, 14 Apr 2022 14:21:31 -0700 (PDT) Received: from yewun.. (218-173-153-1.dynamic-ip.hinet.net. [218.173.153.1]) by smtp.gmail.com with ESMTPSA id b2-20020a056a000a8200b004f1111c66afsm783481pfl.148.2022.04.14.14.21.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Apr 2022 14:21:30 -0700 (PDT) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH 4/7][RFC][LRM][Unstable] debian: add an additional module arg to transitional command Date: Fri, 15 Apr 2022 05:21:20 +0800 Message-Id: <20220414212123.3616050-5-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220414212123.3616050-1-vicamo.yang@canonical.com> References: <20220414212123.3616050-1-vicamo.yang@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.210.170; envelope-from=vicamo@gmail.com; helo=mail-pf1-f170.google.com 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" From: "You-Sheng Yang (vicamo)" BugLink: https://bugs.launchpad.net/bugs/1962515 Signed-off-by: You-Sheng Yang (vicamo) --- debian/package.config | 4 ++-- debian/scripts/gen-rules.lrm | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/debian/package.config b/debian/package.config index af66d63..d2b2dd0 100644 --- a/debian/package.config +++ b/debian/package.config @@ -2,8 +2,8 @@ build generic amd64 arm64 build generic-64k arm64 option desktop option server -transitional 440-oem-20.04 450-generic amd64 -transitional 450-oem-20.04 450-generic amd64 +transitional nvidia 440-oem-20.04 450-generic amd64 +transitional nvidia 450-oem-20.04 450-generic amd64 suppress nvidia-graphics-drivers-390 suppress nvidia-graphics-drivers-418-server suppress nvidia-graphics-drivers-450-server diff --git a/debian/scripts/gen-rules.lrm b/debian/scripts/gen-rules.lrm index 536ff33..a24629a 100755 --- a/debian/scripts/gen-rules.lrm +++ b/debian/scripts/gen-rules.lrm @@ -241,7 +241,7 @@ EOL done <"debian/dkms-versions" done <"debian/package.config" -while read command from to archs +while read command module from to archs do case "$command" in transitional) ;; @@ -249,14 +249,14 @@ do esac # debian/control.d/transitionals-local - echo "II: manual transition linux-modules-nvidia-$from -> linux-modules-nvidia-$to $archs" + echo "II: manual transition linux-modules-${module}-$from -> linux-modules-${module}-$to $archs" cat - >>"debian/control.d/transitionals-local" <