From patchwork Thu Apr 14 21:21:18 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: 1617465 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 4KfXTP2GS2z9sGP 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 1nf6uD-00089Z-72; Thu, 14 Apr 2022 21:21:33 +0000 Received: from mail-pg1-f171.google.com ([209.85.215.171]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nf6uB-00088H-3I for kernel-team@lists.ubuntu.com; Thu, 14 Apr 2022 21:21:31 +0000 Received: by mail-pg1-f171.google.com with SMTP id k14so5882881pga.0 for ; Thu, 14 Apr 2022 14:21:30 -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=HOzj5QAsr0zscei+0/7Cgs5SsVIS6awODBMJ51X5IVg=; b=BiVGYiWC57cu39nMDLBnUYYtjeH5+vNB9oxAbJWlShKrRDSU4lLd9oSWi4IAvVH3OI QmRT5/zzqom/ttu8UEEfoh1KT/LvfN0rAa3FHqyDyYulHpAL4mN4kqeXM4lbegozGDvh F9RDDF0Bi8oJYpS1RmU4YfI1jsi57RnhrdqQuGnAT1RnLkaPRoDYTjI07Lj4hyigaAIi /a0KSwyBCm4QUhvr/Sxqwy8F0s9Xbf6ArztYkFn1a3Eyax/ykhHkGbKSDjnT8tnSbCxQ W6JCLqBYeUjArzPs+EULw6NsPoEBHpkpFVlp6cqaM8UHY4Zj6B89DYaTKn2hiJjRF5Ki ll0g== X-Gm-Message-State: AOAM532knRXUxjfocfk634zE5x54ViSIHPub2mz9y+9BRX+yIvA9BMQX bW9Mnia75oTOQQJITgcQp6SwKFLFIpA= X-Google-Smtp-Source: ABdhPJxGm9CJ8rr99fd4vpxtZ7KlnPFEJ4opf6L8t+Ko0sTh7Tl7yTorSsBu5j6lDNu2+cIoMwD0MQ== X-Received: by 2002:a05:6a00:130e:b0:4f3:9654:266d with SMTP id j14-20020a056a00130e00b004f39654266dmr5731774pfu.59.1649971289020; Thu, 14 Apr 2022 14:21:29 -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.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Apr 2022 14:21:28 -0700 (PDT) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/7][RFC][LRM][Unstable] debian: rename deb-substvar nvk to a module neutral name Date: Fri, 15 Apr 2022 05:21:18 +0800 Message-Id: <20220414212123.3616050-3-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.215.171; envelope-from=vicamo@gmail.com; helo=mail-pg1-f171.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/scripts/gen-rules.lrm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/scripts/gen-rules.lrm b/debian/scripts/gen-rules.lrm index d4c6593..42f72ce 100755 --- a/debian/scripts/gen-rules.lrm +++ b/debian/scripts/gen-rules.lrm @@ -143,7 +143,7 @@ EOL dkms_nvidia_${suffix_under}_version=\$(shell gawk '/^${package} / { print \$\$2; }' debian/dkms-versions) nvidia_${suffix_under}_upstream_version=\$(shell echo "\$(dkms_nvidia_${suffix_under}_version)" | cut -d '-' -f 1) gencontrol_flags += -Vdkms:nvidia-${suffix_minus}-modules="nvidia-dkms-${suffix_minus} (= \$(dkms_nvidia_${suffix_under}_version))" -gencontrol_flags += -Vnvk:nvidia-${suffix_minus}="nvidia-kernel-common-${suffix_minus} (<= \$(nvidia_${suffix_under}_upstream_version)-1), nvidia-kernel-common-${suffix_minus} (>= \$(nvidia_${suffix_under}_upstream_version))" +gencontrol_flags += -Vadditional-deps:nvidia-${suffix_minus}="nvidia-kernel-common-${suffix_minus} (<= \$(nvidia_${suffix_under}_upstream_version)-1), nvidia-kernel-common-${suffix_minus} (>= \$(nvidia_${suffix_under}_upstream_version))" test:: @echo $package $version $suffix_minus $suffix_under $suffix_short $targets $targets:: @@ -167,7 +167,7 @@ Provides: \${dkms:nvidia-${suffix_minus}-modules}, nvidia-prebuilt-kernel Depends: \${misc:Depends}, linux-modules-nvidia-${suffix_minus}-${src_abi}-${flavour} (= \${binary:Version}), - \${nvk:nvidia-${suffix_minus}}, + \${additional-deps: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 @@ -205,7 +205,7 @@ Depends: linux-image-${src_abi}-${flavour} | linux-image-unsigned-${src_abi}-${flavour}, linux-signatures-nvidia-${src_abi}-${flavour} (= ${src_sigs_version}), linux-objects-nvidia-${suffix_minus}-${src_abi}-${flavour} (= \${binary:Version}), - \${nvk:nvidia-${suffix_minus}}, + \${additional-deps:nvidia-${suffix_minus}}, Description: Linux kernel nvidia modules for version ${src_abi} This package pulls together the Linux kernel nvidia modules for version ${src_abi} with the appropriate signatures.