From patchwork Fri Apr 22 17:10:17 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: 1620988 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 4KlLXg0Mxjz9sFq for ; Sat, 23 Apr 2022 03:11:15 +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 1nhwoB-0005MF-OH; Fri, 22 Apr 2022 17:11:03 +0000 Received: from mail-pl1-f182.google.com ([209.85.214.182]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nhwnx-0004ro-UW for kernel-team@lists.ubuntu.com; Fri, 22 Apr 2022 17:10:50 +0000 Received: by mail-pl1-f182.google.com with SMTP id j8so12186066pll.11 for ; Fri, 22 Apr 2022 10:10:44 -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=DoPmAqQZckn7vLaSNwVmaYjfm8j1nS2K/3PQWclsVL8=; b=NmdEqT1zy/pyA9tYNxOTcjRkpzb8zP7isZ/8od85W2W4SngAVudswlky7Nfse13d1D fE/yBmLbr+lCVXGbk1lfFXF97Kd7gcSPeFTOoQbYdPeEqp/JO7kZBjixv2WKf+j3k/ny +wJ5TnHEllxVFCo9Otxl8u6SPtmanCZJyVIBHGFdNiSiU9ufJrH4+Ekp1gOEuLz04s89 oVaNEMjanDl6rCTNYwg0kTF4dm/oFWTOidGvtXag30Cu7PgYFCxP1kp+UN4b1AcHkDgm wt4c2gwWMYEeAai35if5l2P7hZUyXZjlnk0kuvYZoS+UGLKYerdx/QmpKGx2tt3Zk1ag sQUQ== X-Gm-Message-State: AOAM533arXBqK0595KEeMmWNpWhd7ixLvSf6psTI4e2LK8XAoJHcaP3z KThNhy2cdIisuRV6hGTuQzdUQPMef2Q= X-Google-Smtp-Source: ABdhPJwG1SEd0HqLN9Y5kY7HYpYjpdndGJy97T/wZ6d8uX14/i479VPDWP5rwigDDG2aVdsgILavBg== X-Received: by 2002:a17:902:ab8e:b0:158:a3ca:3dfc with SMTP id f14-20020a170902ab8e00b00158a3ca3dfcmr5427204plr.62.1650647441515; Fri, 22 Apr 2022 10:10:41 -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.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Apr 2022 10:10:41 -0700 (PDT) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH V2 4/6][SRU][Unstable] UBUNTU: [Packaging] add arch= in dkms-versions Date: Sat, 23 Apr 2022 01:10:17 +0800 Message-Id: <20220422171021.2382248-14-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.182; envelope-from=vicamo@gmail.com; helo=mail-pl1-f182.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.master/rules.d/amd64.mk | 2 -- debian.master/rules.d/arm64.mk | 1 - debian.master/rules.d/ppc64el.mk | 1 - debian.master/rules.d/s390x.mk | 2 -- debian/dkms-versions | 4 ++-- debian/rules | 5 +++++ debian/rules.d/0-common-vars.mk | 5 +++++ 7 files changed, 12 insertions(+), 8 deletions(-) diff --git a/debian.master/rules.d/amd64.mk b/debian.master/rules.d/amd64.mk index 2288c25a7a52..d0384f0227a4 100644 --- a/debian.master/rules.d/amd64.mk +++ b/debian.master/rules.d/amd64.mk @@ -20,6 +20,4 @@ do_tools_host = true do_extras_package = true do_tools_common = true do_tools_acpidbg = true -do_zfs = true -do_v4l2loopback = true do_odm_drivers = true diff --git a/debian.master/rules.d/arm64.mk b/debian.master/rules.d/arm64.mk index e0415a4075ac..d215e1bda1fe 100644 --- a/debian.master/rules.d/arm64.mk +++ b/debian.master/rules.d/arm64.mk @@ -19,4 +19,3 @@ do_tools_perf_jvmti = true do_tools_bpftool = true do_dtbs = true -do_zfs = true diff --git a/debian.master/rules.d/ppc64el.mk b/debian.master/rules.d/ppc64el.mk index ec8f7e914614..b205a5153b51 100644 --- a/debian.master/rules.d/ppc64el.mk +++ b/debian.master/rules.d/ppc64el.mk @@ -16,4 +16,3 @@ do_tools_perf_jvmti = true do_tools_bpftool = true #do_flavour_image_package = false -do_zfs = true diff --git a/debian.master/rules.d/s390x.mk b/debian.master/rules.d/s390x.mk index 4b3698fc9c45..0620c638a724 100644 --- a/debian.master/rules.d/s390x.mk +++ b/debian.master/rules.d/s390x.mk @@ -17,5 +17,3 @@ do_tools_cpupower = true do_tools_perf = true do_tools_perf_jvmti = true do_tools_bpftool = true - -do_zfs = true diff --git a/debian/dkms-versions b/debian/dkms-versions index 28408b5b3ccb..94888e3539e3 100644 --- a/debian/dkms-versions +++ b/debian/dkms-versions @@ -1,2 +1,2 @@ -v4l2loopback 0.12.5-1ubuntu5 modulename=v4l2loopback debpath=pool/universe/v/v4l2loopback/v4l2loopback-dkms_0.12.5-1ubuntu5_all.deb rprovides=v4l2loopback-modules rprovides=v4l2loopback-dkms -zfs-linux 2.1.2-1ubuntu3 modulename=zfs debpath=pool/universe/z/zfs-linux/zfs-dkms_2.1.2-1ubuntu3_all.deb rprovides=spl-modules rprovides=spl-dkms rprovides=zfs-modules rprovides=zfs-dkms +v4l2loopback 0.12.5-1ubuntu5 modulename=v4l2loopback debpath=pool/universe/v/v4l2loopback/v4l2loopback-dkms_0.12.5-1ubuntu5_all.deb arch=amd64 rprovides=v4l2loopback-modules rprovides=v4l2loopback-dkms +zfs-linux 2.1.2-1ubuntu3 modulename=zfs debpath=pool/universe/z/zfs-linux/zfs-dkms_2.1.2-1ubuntu3_all.deb arch=amd64 arch=arm64 arch=ppc64el arch=s390x rprovides=spl-modules rprovides=spl-dkms rprovides=zfs-modules rprovides=zfs-dkms diff --git a/debian/rules b/debian/rules index 894bb5960437..16623f8bd9b4 100755 --- a/debian/rules +++ b/debian/rules @@ -40,6 +40,11 @@ do_tools_host?=false do_tools_perf_jvmti?=false do_enforce_all?=false +# Default settings for DKMS modules. +$(foreach _m,$(all_dkms_modules), \ + $(eval do_$(_m) ?= $(if $(filter $(arch),$(filter-out $(dkms_exclude),$(if $(filter __all__,$(dkms_$(_m)_archs)),$(arch),$(dkms_$(_m)_archs)) $(dkms_include))),true,false)) \ +) + # Don't build tools in a cross compile environment. ifneq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH)) do_tools=false diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk index fcbfffc06eba..b3409ac3614d 100644 --- a/debian/rules.d/0-common-vars.mk +++ b/debian/rules.d/0-common-vars.mk @@ -305,5 +305,10 @@ $(foreach _line,$(shell gawk '{ OFS = "!"; $$1 = $$1; print }' $(DROOT)/dkms-ver , \ $(error debpath for $(_deb_pkgname) not specified.) \ ) \ + $(if $(filter arch=%,$(_params)), \ + $(eval dkms_$(_m)_archs = $(patsubst arch=%,%,$(filter arch=%,$(_params)))) \ + , \ + $(eval dkms_$(_m)_archs = __all__) \ + ) \ $(eval dkms_$(_m)_rprovides = $(patsubst rprovides=%,%,$(filter rprovides=%,$(_params)))) \ )