From patchwork Fri Apr 22 17:10:13 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: 1620985 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 4KlLXP5GXPz9sFq for ; Sat, 23 Apr 2022 03:11:01 +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 1nhwnz-000562-IB; Fri, 22 Apr 2022 17:10:51 +0000 Received: from mail-pl1-f180.google.com ([209.85.214.180]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nhwnu-0004je-Bz for kernel-team@lists.ubuntu.com; Fri, 22 Apr 2022 17:10:46 +0000 Received: by mail-pl1-f180.google.com with SMTP id j8so12185624pll.11 for ; Fri, 22 Apr 2022 10:10:38 -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=hU6A94JhaGxOYNpPbGM09fTJPyh/4/ga7hVh0lr9W7Q=; b=06P5q0gnemiNLFUzqzV2z7mIWIjQt4Y3/m+HSsWmT2YOH9dXwuRveNmEBnB43Is2kB q/vrEnvkjBcxDhD0k/8XMS1p2Y73/7ZNRUz/TOmbHmDeJJAiZK8KKEhVqS9zKi9kCGTd d6ZwPIY13A/Xh0ZfKlxXn1FoNr51srnnRkNmwD1ALyiLiePORGRaXafwatwGCa3/nuOD ITEoB9NUYCQXZQzdbQecxnlbl6YMHq7isE7XnRq8nq76vLIvqt+M/ZZA6oimnK3RCp/a nX7w6OsazsNcuvL5cxKV6A6GHqJJeqXH1atVHPtt0K1kG//aEW2mQ70o+frs4rKChfeX zemw== X-Gm-Message-State: AOAM532baQAnOgm5d7bztBPJ6mKp1IegI95eQw3pn12UikyrfswAvD5B rcr/dXxd2oHg17U3lQ/zy6PT4kWGaZ8= X-Google-Smtp-Source: ABdhPJwvL/+VU3W5PFUHVACGr6cvY8IDm+hGRZ9PEEl3okIBRybGRauCWXYLh5g1OFGdJL9uW2Zq2w== X-Received: by 2002:a17:90a:d915:b0:1d5:f918:5017 with SMTP id c21-20020a17090ad91500b001d5f9185017mr6383571pjv.157.1650647436667; Fri, 22 Apr 2022 10:10:36 -0700 (PDT) Received: from yewun.. (218-173-163-52.dynamic-ip.hinet.net. [218.173.163.52]) by smtp.gmail.com with ESMTPSA id by8-20020a056a00400800b0050a96357226sm2948332pfb.40.2022.04.22.10.10.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Apr 2022 10:10:36 -0700 (PDT) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH V2 3/6][SRU][OEM-5.14] UBUNTU: [Packaging] add rprovides= in dkms-versions Date: Sat, 23 Apr 2022 01:10:13 +0800 Message-Id: <20220422171021.2382248-10-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220422171021.2382248-1-vicamo.yang@canonical.com> References: <20220422171021.2382248-1-vicamo.yang@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.214.180; envelope-from=vicamo@gmail.com; helo=mail-pl1-f180.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/1969434 Signed-off-by: You-Sheng Yang (vicamo) --- debian/dkms-versions | 4 ++-- debian/rules.d/0-common-vars.mk | 1 + debian/rules.d/2-binary-arch.mk | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/dkms-versions b/debian/dkms-versions index 87658bdc0921..3c4bd967ffd6 100644 --- a/debian/dkms-versions +++ b/debian/dkms-versions @@ -1,2 +1,2 @@ -v4l2loopback 0.12.5-1ubuntu3 modulename=v4l2loopback debpath=pool/universe/v/v4l2loopback/v4l2loopback-dkms_0.12.5-1ubuntu3_all.deb -zfs-linux 2.0.6-1ubuntu2.1 modulename=zfs debpath=pool/universe/z/zfs-linux/zfs-dkms_2.0.6-1ubuntu2.1_all.deb +v4l2loopback 0.12.5-1ubuntu3 modulename=v4l2loopback debpath=pool/universe/v/v4l2loopback/v4l2loopback-dkms_0.12.5-1ubuntu3_all.deb rprovides=v4l2loopback-modules rprovides=v4l2loopback-dkms +zfs-linux 2.0.6-1ubuntu2.1 modulename=zfs debpath=pool/universe/z/zfs-linux/zfs-dkms_2.0.6-1ubuntu2.1_all.deb rprovides=spl-modules rprovides=spl-dkms rprovides=zfs-modules rprovides=zfs-dkms diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk index 43dcc3db248c..5500cabc48ed 100644 --- a/debian/rules.d/0-common-vars.mk +++ b/debian/rules.d/0-common-vars.mk @@ -302,4 +302,5 @@ $(foreach _line,$(shell gawk '{ OFS = "!"; $$1 = $$1; print }' $(DROOT)/dkms-ver , \ $(error debpath for $(_deb_pkgname) not specified.) \ ) \ + $(eval dkms_$(_m)_rprovides = $(patsubst rprovides=%,%,$(filter rprovides=%,$(_params)))) \ ) diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 221567547a4c..21decd233d33 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -589,8 +589,7 @@ binary-%: pkgcloud = $(cloud_flavour_pkg_name)-$* $(foreach _m,$(all_dkms_modules), \ $(eval binary-%: enable_$(_m) = $$(filter true,$$(call custom_override,do_$(_m),$$*))) \ ) -binary-%: rprovides = $(if $(enable_zfs),spl-modules$(comma) spl-dkms$(comma) zfs-modules$(comma) zfs-dkms$(comma)) \ - $(if $(enable_v4l2loopback),v4l2loopback-modules$(comma) v4l2loopback-dkms$(comma)) +binary-%: rprovides = $(foreach _m,$(all_dkms_modules),$(if $(enable_$(_m)),$(foreach _r,$(dkms_$(_m)_rprovides),$(_r)$(comma) ))) binary-%: target_flavour = $* binary-%: checks-% @echo Debug: $@