From patchwork Mon Jan 3 18:35:40 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: 1574836 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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 4JSPZw55Fwz9t0k for ; Tue, 4 Jan 2022 05:36:08 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1n4SBd-0007Q6-1q; Mon, 03 Jan 2022 18:36:01 +0000 Received: from mail-pg1-f182.google.com ([209.85.215.182]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1n4SBb-0007NJ-56 for kernel-team@lists.ubuntu.com; Mon, 03 Jan 2022 18:35:59 +0000 Received: by mail-pg1-f182.google.com with SMTP id f8so20646318pgf.8 for ; Mon, 03 Jan 2022 10:35:57 -0800 (PST) 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=17KtygNMoB8U9MaWVryD3cO9Ox8gelmgtQ3PQGekevw=; b=TNviA6pKXf7EA96r3l6ThBxfb7g/jEHXklOLILFnxF6KPXaJsX5bJ3Q7gO7crJHSdy dV2pndXqDI/Kv/JRnxfKIVX2DsUG33EwLXPnrzySkgWl+ZdLD0sj47kVIyK/IefD/jS6 hs6q9WqLL/UxJM5kndEKOgYGQk6rEp737wIQsCkIXmUhg3a6I7FlhhwJg5EzdWWkrqPk ICz+vmFtgiZGyYWmkiacnfX4vUplqXk9aI2I+lihN5bBNJmCCV9P9jjMMgON1p1e4W3F A1FiPrhEtOWnjWyJx7T0MXWehds+NeXbePlDRDb1EVWKS0I0c3pYGfjeycHzj/aOplHZ cmEQ== X-Gm-Message-State: AOAM530E13A40d6zEowFmZgHFnOux4dS3Xrzc+4YpF6VWMFIlSuXt6HS ZaT2TUPlx8pGXj2k3wmSH+RqSEdpnd4= X-Google-Smtp-Source: ABdhPJwk54yquUt5ZmE9Z868Vz2y3Zt7HfsBGCZ7vw8edlo/MmhStQoADC192wJXujDJmekNbFHIww== X-Received: by 2002:a63:7746:: with SMTP id s67mr41484597pgc.334.1641234956080; Mon, 03 Jan 2022 10:35:56 -0800 (PST) Received: from localhost (218-173-136-205.dynamic-ip.hinet.net. [218.173.136.205]) by smtp.gmail.com with ESMTPSA id k2sm32471652pgh.11.2022.01.03.10.35.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jan 2022 10:35:55 -0800 (PST) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/3][SRU][Jammy] UBUNTU: support v4l2loopback dkms build Date: Tue, 4 Jan 2022 02:35:40 +0800 Message-Id: <20220103183547.434284-5-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220103183547.434284-1-vicamo.yang@canonical.com> References: <20220103183547.434284-1-vicamo.yang@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.215.182; envelope-from=vicamo@gmail.com; helo=mail-pg1-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" BugLink: https://bugs.launchpad.net/bugs/1938531 Signed-off-by: You-Sheng Yang --- debian/rules | 6 ++++++ debian/rules.d/2-binary-arch.mk | 10 +++++++--- debian/v4l2loopback-modules.ignore | 1 + 3 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 debian/v4l2loopback-modules.ignore diff --git a/debian/rules b/debian/rules index 16a069766e59..eca69cdc98a3 100755 --- a/debian/rules +++ b/debian/rules @@ -75,6 +75,7 @@ endif ifneq ($(filter autopkgtest,$(DEB_BUILD_PROFILES)),) flavours := $(firstword $(flavours)) do_zfs=false + do_v4l2loopback=false endif # Being used to build a mainline build -- turn off things which do not work. @@ -100,6 +101,10 @@ ifeq ($(do_zfs),false) do_zfs_disable:=$(shell for m in $$(cat $(DROOT)/zfs-modules.ignore); do grep -qxF $$m $(prev_abidir)/../modules.ignore 2>/dev/null || echo $$m >> $(prev_abidir)/../modules.ignore; done) endif +ifeq ($(do_v4l2loopback),false) + do_v4l2loopback_disable:=$(shell for m in $$(cat $(DROOT)/v4l2loopback-modules.ignore); do grep -qxF $$m $(prev_abidir)/../modules.ignore 2>/dev/null || echo $$m >> $(prev_abidir)/../modules.ignore; done) +endif + ifeq ($(do_dkms_wireguard),false) do_wireguard_disable:=$(shell for m in $$(cat $(DROOT)/wireguard-modules.ignore); do grep -qxF $$m $(prev_abidir)/../modules.ignore 2>/dev/null || echo $$m >> $(prev_abidir)/../modules.ignore; done) endif @@ -109,6 +114,7 @@ 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) diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 996512f9ce0b..773da8e05a0e 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -118,7 +118,8 @@ $(stampdir)/stamp-install-%: MODPUBKEY=$(builddir)/build-$*/certs/signing_key.x5 $(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-%: dbgpkgdir_zfs = $(if $(filter true,$(skipdbg)),"",$(dbgpkgdir)/usr/lib/debug/lib/modules/$(abi_release)-$*/kernel) +$(stampdir)/stamp-install-%: enable_v4l2loopback = $(call custom_override,do_v4l2loopback,$*) +$(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) dh_testdir @@ -411,7 +412,9 @@ 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_zfs), zfs, pool/universe/z/zfs-linux/zfs-dkms_$(dkms_zfs_linux_version)_all.deb)) + $(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)) + ifneq ($(skipdbg),true) # Add .gnu_debuglink sections to each stripped .ko @@ -583,7 +586,8 @@ binary-%: dbgpkg = $(bin_pkg_name)-$*-dbgsym binary-%: dbgpkgdir = $(CURDIR)/debian/$(bin_pkg_name)-$*-dbgsym binary-%: pkgtools = $(tools_flavour_pkg_name)-$* binary-%: pkgcloud = $(cloud_flavour_pkg_name)-$* -binary-%: rprovides = $(if $(filter true,$(call custom_override,do_zfs,$*)),spl-modules$(comma) spl-dkms$(comma) zfs-modules$(comma) zfs-dkms$(comma)) +binary-%: rprovides = $(if $(filter true,$(call custom_override,do_zfs,$*)),spl-modules$(comma) spl-dkms$(comma) zfs-modules$(comma) zfs-dkms$(comma)) \ + $(if $(filter true,$(call custom_override,do_v4l2loopback,$*)),v4l2loopback-modules$(comma) v4l2loopback-dkms$(comma)) binary-%: target_flavour = $* binary-%: checks-% @echo Debug: $@ diff --git a/debian/v4l2loopback-modules.ignore b/debian/v4l2loopback-modules.ignore new file mode 100644 index 000000000000..d394e47bc819 --- /dev/null +++ b/debian/v4l2loopback-modules.ignore @@ -0,0 +1 @@ +v4l2loopback