From patchwork Tue Apr 19 17:23:04 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: 1619166 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 4KjVz21PhMz9sG0 for ; Wed, 20 Apr 2022 03:24:12 +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 1ngra6-0004bX-2X; Tue, 19 Apr 2022 17:24:02 +0000 Received: from mail-pj1-f53.google.com ([209.85.216.53]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1ngra2-0004a2-T0 for kernel-team@lists.ubuntu.com; Tue, 19 Apr 2022 17:23:59 +0000 Received: by mail-pj1-f53.google.com with SMTP id md20-20020a17090b23d400b001cb70ef790dso2464686pjb.5 for ; Tue, 19 Apr 2022 10:23:58 -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=U3zEMt1Sf/WET0shEd9X9U2PAKjKTYNerLpDlEIKkOc=; b=19j+X9rSd3My4A9wrw12s+GqSf0CNlXBNLaJUMJZvnjEj4OuR++2kBYLS2kURGDUct g4/JYOvc+kWCUlumOnx9/gu/g3i+pXUok/oY8zIg0OLhSTtwn374dEHv1FsDofq2vdXj 25vQ3DK8UGXa6RIvqyufNbIaT5PbfY3hoBSCcfOZobooTAv4DJMyZKQEdy2QE8ehdeLk D4FXIr3j0h64kQYxBUYJPDf7YmJei0DoBUFGX/LVv4hFlW2HNa2ldzpFSe+l2HTpZsb4 LJ3a4jvr1/9e9IGHZKn5eXdmEdW1E727q+IE0rZIulKjekPLdtL6wXAIkUkUu/efFrGI /dWQ== X-Gm-Message-State: AOAM530dk58ij/gCVa1FdJ1wscv5gLF0GwFABMUaeR5TBRE3U7sogkmH 0VNu93AFigmhmZI1KNCFLBwX4UN/LpU= X-Google-Smtp-Source: ABdhPJyDqwFdMQC01N/rLAkLSq0rzLHh3xwR8lZfK3pu2BhCaqJjvNDCZMevhbjKz06IxClVhtUMIg== X-Received: by 2002:a17:902:bd89:b0:156:8467:782b with SMTP id q9-20020a170902bd8900b001568467782bmr16616059pls.12.1650389036687; Tue, 19 Apr 2022 10:23:56 -0700 (PDT) Received: from localhost.localdomain (114-40-200-43.dynamic-ip.hinet.net. [114.40.200.43]) by smtp.gmail.com with ESMTPSA id c11-20020a056a000acb00b004f35ee129bbsm18462918pfl.140.2022.04.19.10.23.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Apr 2022 10:23:56 -0700 (PDT) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/4][SRU][OEM-5.14/Jammy/OEM-5.17/unstable] UBUNTU: [Packaging] add common rules for dkms builds Date: Wed, 20 Apr 2022 01:23:04 +0800 Message-Id: <20220419172311.3212395-2-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220419172311.3212395-1-vicamo.yang@canonical.com> References: <20220419172311.3212395-1-vicamo.yang@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.216.53; envelope-from=vicamo@gmail.com; helo=mail-pj1-f53.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/rules | 4 ---- debian/rules.d/0-common-vars.mk | 8 ++++++++ debian/rules.d/2-binary-arch.mk | 7 +++---- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/debian/rules b/debian/rules index eca69cdc98a3..948711203ccc 100755 --- a/debian/rules +++ b/debian/rules @@ -112,10 +112,6 @@ endif # Either tools package needs the common source preparation do_any_tools=$(sort $(filter-out false,$(do_linux_tools) $(do_cloud_tools))) -# Versions of dkms packages. -dkms_zfs_linux_version=$(shell gawk '/^zfs-linux / { print $$2; }' debian/dkms-versions) -dkms_v4l2loopback_version=$(shell gawk '/^v4l2loopback / { print $$2; }' debian/dkms-versions) - # NVIDIA DKMS package gross series split into desktop and server. nvidia_desktop_series=$(shell sed -n -e 's/^nvidia-graphics-drivers-\([0-9][0-9]*\) .*/\1/p' debian/dkms-versions) nvidia_server_series=$(shell sed -n -e 's/^nvidia-graphics-drivers-\([0-9][0-9]*-server\) .*/\1/p' debian/dkms-versions) diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk index 78f8a0f16e3a..9596c98ae374 100644 --- a/debian/rules.d/0-common-vars.mk +++ b/debian/rules.d/0-common-vars.mk @@ -285,3 +285,11 @@ custom_override = \ # selftests that Ubuntu cares about ubuntu_selftests = breakpoints cpu-hotplug efivarfs memfd memory-hotplug mount net ptrace seccomp timers powerpc user ftrace + +# DKMS +_all_dkms_versions = $(shell gawk '{ print $$1 ":" $$2 }' debian/dkms-versions) +dkms_srcpkg_to_module = $(if $(filter zfs-linux,$(1)),zfs,$(1)) +$(foreach _v,$(_all_dkms_versions),$(eval dkms_$(call dkms_srcpkg_to_module,$(firstword $(subst :, ,$(_v))))_version = $(word 2,$(subst :, ,$(_v))))) +all_dkms_modules = $(foreach _v,$(_all_dkms_versions),$(call dkms_srcpkg_to_module,$(firstword $(subst :, ,$(_v))))) +dkms_v4l2loopback_deb_path = pool/universe/v/v4l2loopback/v4l2loopback-dkms_$(dkms_v4l2loopback_version)_all.deb +dkms_zfs_deb_path = pool/universe/z/zfs-linux/zfs-dkms_$(dkms_zfs_version)_all.deb diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index c4906036ceb8..957445a4b83b 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -117,8 +117,8 @@ $(stampdir)/stamp-install-%: MODSECKEY=$(builddir)/build-$*/certs/signing_key.pe $(stampdir)/stamp-install-%: MODPUBKEY=$(builddir)/build-$*/certs/signing_key.x509 $(stampdir)/stamp-install-%: build_dir=$(builddir)/build-$* $(stampdir)/stamp-install-%: dkms_dir=$(call dkms_dir_prefix,$(builddir)/build-$*) -$(stampdir)/stamp-install-%: enable_zfs = $(call custom_override,do_zfs,$*) -$(stampdir)/stamp-install-%: enable_v4l2loopback = $(call custom_override,do_v4l2loopback,$*) +$(foreach _m,$(all_dkms_modules), \ + $(eval $$(stampdir)/stamp-install-%: enable_$(_m) = $$(call custom_override,do_$(_m),$$*))) $(stampdir)/stamp-install-%: dbgpkgdir_dkms = $(if $(filter true,$(skipdbg)),"",$(dbgpkgdir)/usr/lib/debug/lib/modules/$(abi_release)-$*/kernel) $(stampdir)/stamp-install-%: $(stampdir)/stamp-build-% $(stampdir)/stamp-install-headers @echo Debug: $@ kernel_file $(kernel_file) kernfile $(kernfile) install_file $(install_file) instfile $(instfile) @@ -412,8 +412,7 @@ endif install -d $(dkms_dir) $(dkms_dir)/headers $(dkms_dir)/build $(dkms_dir)/source cp -rp "$(hdrdir)" "$(indep_hdrdir)" "$(dkms_dir)/headers" - $(if $(filter true,$(enable_zfs)),$(call build_dkms, $(mods_pkg_name)-$*, $(pkgdir)/lib/modules/$(abi_release)-$*/kernel, $(dbgpkgdir_dkms), zfs, pool/universe/z/zfs-linux/zfs-dkms_$(dkms_zfs_linux_version)_all.deb)) - $(if $(filter true,$(enable_v4l2loopback)),$(call build_dkms, $(mods_pkg_name)-$*, $(pkgdir)/lib/modules/$(abi_release)-$*/kernel, $(dbgpkgdir_dkms), v4l2loopback, pool/universe/v/v4l2loopback/v4l2loopback-dkms_$(dkms_v4l2loopback_version)_all.deb)) + $(foreach _m,$(all_dkms_modules),$(if $(filter true,$(enable_$(_m))),$(call build_dkms, $(mods_pkg_name)-$*, $(pkgdir)/lib/modules/$(abi_release)-$*/kernel, $(dbgpkgdir_dkms),$(_m),$(dkms_$(_m)_deb_path)))) ifneq ($(skipdbg),true)