From patchwork Wed Sep 2 17:48:45 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alessio Faina X-Patchwork-Id: 2296901 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4hZqwc4Qxzz1y1C for ; Thu, 03 Sep 2026 03:49:03 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1x1p4s-0001va-V0; Wed, 02 Sep 2026 17:48:50 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1x1p4r-0001vH-J0 for kernel-team@lists.ubuntu.com; Wed, 02 Sep 2026 17:48:49 +0000 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 726943F2B4 for ; Wed, 2 Sep 2026 17:48:49 +0000 (UTC) Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-499b99a8a10so839925e9.0 for ; Wed, 02 Sep 2026 10:48:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788371329; x=1788976129; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to:content-type; bh=aVlLr0zcbZJ3kmSieCtCqYdq5ayCnYN6aoZxIA787Gk=; b=HgN44Je3pqY0VsU+VFZUmYXMQxFpOG+sdb/mldRRNjTwR1+jUcaXcWGfHx5gP9q5ZA 9O5qdgBjoIMmmQlDJhnZN46gU1DOO0Pga35c5U3CO5yNoDJWsZ7HMbPgLQw6PWyYmkUk g5M2cZQX1vQJcdkAzmTrQGAy4VLEkxSb+uu7QWjxohvPh0U4PCLZ6AhO5IHBHGIVefJC PST6M8dyTjth/5h0i/ZBJHRXNsinAVLumNKAy9o29lO2aEtYOnzGLd5rlSV0zYMxwGuM P+mjj200Zwku6n3igANSthXGD+NHDq9aguBFZOEWYtmNNMy/xFd+PF1Gm5iCPWSpvKCa cnsg== X-Gm-Message-State: AFuF++n9ecZS2G1dYkWpuKJwasHxtNrIQKMBQ2zB1FQAV4WmQ0YC5rbq Otnl++gd3WG/YqIeplzmMDEv0x6O3pNBRw11DLXHRMi78xz743nZNcsAAQSxBir/ItggqPtTFbU bmmypMq4/vxEhd1Kirg7cThLteeZc2p4ymnKgT6JuJyxj68wAOLbaTJHLYzRadm8fVKPcEIWPeH RRrWMRbxTNFjLWUg== X-Gm-Gg: AR+sD107ZX+48EEyj14L5iGmrbNus+JHhqNClljw15DfwNQbjb+ivvSsYv5DkBZY4AQ jCbVbYOgpYleGRQIBxxMTLiI02Abn2B5vN9QW+jCZiMICOjy4Y1iV7H/sahjchaJ3+VrIWG35l0 pOnzIrEzsc1zDvzpXkz1orBEA9RgM1gHnTzZwmipuKQfIfNmGCUmgMqASzX1o5T9McnX8VSalQT T66Vwr2Vb8cnAHqI54dj69gLiqg/dqXJDDuTMokqX1Yn5ZKP+WaWYTs/2k1lccdjzpeU6kYZmRa 7FxA+PuzCLpLsLiU70weWvYLNhvBW6KuYbRwosnwwgmSf8oCQ3YluALveccgJFRhWv45/5iQeZz NBpXWa7MPfbSZLMSQcwJJrv99DNyoko8fJzdP5QmiKdUtgvDcgYBqDp4wniwB/qgom6E= X-Received: by 2002:a05:600c:a314:b0:49c:799a:177b with SMTP id 5b1f17b1804b1-49cee5da02emr17311745e9.2.1788371329041; Wed, 02 Sep 2026 10:48:49 -0700 (PDT) X-Received: by 2002:a05:600c:a314:b0:49c:799a:177b with SMTP id 5b1f17b1804b1-49cee5da02emr17311135e9.2.1788371328675; Wed, 02 Sep 2026 10:48:48 -0700 (PDT) Received: from localhost (93-40-93-12.ip38.fastwebnet.it. [93.40.93.12]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49cee5d1fa6sm8729925e9.1.2026.09.02.10.48.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Sep 2026 10:48:48 -0700 (PDT) To: kernel-team@lists.ubuntu.com Subject: [SRU][R/S][PATCH v3 1/1] UBUNTU: [packaging] Create a linux-main-modules dependency toggle Date: Wed, 2 Sep 2026 19:48:45 +0200 Message-ID: <11738fa54e0268f1162233825149e946a481c8b1.1788351016.git.alessio.faina@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 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: , X-Patchwork-Original-From: Alessio Faina via kernel-team From: Alessio Faina Reply-To: Alessio Faina Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Create a dependency toggle to manually remove the dependency on linux-main-modules-* packages from the linux-modules package. This is useful for local or CI testing when the companion modules packages are not available. Signed-off-by: Alessio Faina Acked-by: Andrei Gherzan --- debian.master/control.d/vars.generic | 2 ++ debian.master/control.d/vars.generic-64k | 2 ++ debian/rules.d/0-common-vars.mk | 11 +++++++++++ debian/rules.d/1-maintainer.mk | 1 + debian/scripts/control-create | 5 +++++ 5 files changed, 21 insertions(+) diff --git a/debian.master/control.d/vars.generic b/debian.master/control.d/vars.generic index c5a897daf8d0..31c470d3b62e 100644 --- a/debian.master/control.d/vars.generic +++ b/debian.master/control.d/vars.generic @@ -3,4 +3,6 @@ supported="Generic" target="Geared toward desktop and server systems." bootloader="grub-pc [amd64] | grub-efi-amd64 [amd64] | grub-efi-ia32 [amd64] | grub [amd64] | lilo [amd64] | flash-kernel [armhf arm64] | grub-efi-arm64 [arm64] | grub-efi-arm [armhf] | grub-ieee1275 [ppc64el]" provides="kvm-api-4, redhat-cluster-modules, ivtv-modules, virtualbox-guest-modules [amd64]" +# The depends line will be bypassed by the do_linux_main_modules_depends +# config if set to false, skipping all the configured modules depends="linux-main-modules-zfs-PKGVER-ABINUM-generic [amd64 arm64 ppc64el s390x]" diff --git a/debian.master/control.d/vars.generic-64k b/debian.master/control.d/vars.generic-64k index 732326c0ad17..721e6ff14037 100644 --- a/debian.master/control.d/vars.generic-64k +++ b/debian.master/control.d/vars.generic-64k @@ -3,4 +3,6 @@ supported="Generic 64K pages" target="Geared toward desktop and server systems." bootloader="grub-efi-arm64 [arm64] | flash-kernel [arm64]" provides="kvm-api-4, redhat-cluster-modules, ivtv-modules" +# The depends line will be bypassed by the do_linux_main_modules_depends +# config if set to false, skipping all the configured modules depends="linux-main-modules-zfs-PKGVER-ABINUM-generic-64k [arm64]" diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk index 1ea787d668dc..c3a8c4f2ed9e 100644 --- a/debian/rules.d/0-common-vars.mk +++ b/debian/rules.d/0-common-vars.mk @@ -47,6 +47,17 @@ else do_full_build ?= true endif +# +# do_linux_main_modules_depends -- include linux-main-modules-* in linux-modules Depends. +# Set to false to skip these dependencies, e.g. for local or CI testing when +# the companion modules packages are not available. +# +do_linux_main_modules_depends ?= true +export do_linux_main_modules_depends +ifeq ($(do_linux_main_modules_depends),false) + $(info II: do_linux_main_modules_depends=false -- skipping linux-main-modules-* dependencies) +endif + # # The debug packages are ginormous, so you probably want to skip # building them (as a developer). diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk index 6892f71b7964..7055b3c071c5 100644 --- a/debian/rules.d/1-maintainer.mk +++ b/debian/rules.d/1-maintainer.mk @@ -64,6 +64,7 @@ printenv: @echo "do_full_build = $(do_full_build)" @echo "do_mainline_build = $(do_mainline_build)" @echo "do_dbgsym_package = $(do_dbgsym_package)" + @echo "do_linux_main_modules_depends = $(do_linux_main_modules_depends)" @echo "do_dtbs = $(do_dtbs)" @echo "do_source_package = $(do_source_package)" @echo "do_source_package_content = $(do_source_package_content)" diff --git a/debian/scripts/control-create b/debian/scripts/control-create index f96da1ec1168..51baf8fb72a0 100755 --- a/debian/scripts/control-create +++ b/debian/scripts/control-create @@ -46,6 +46,11 @@ gen_per_flavour () { . "${var}" + if [ "${do_linux_main_modules_depends}" = false ]; then + echo "II: do_linux_main_modules_depends=false -- dropping depends '${depends}' for flavour ${flavour}" >&2 + depends='' + fi + if [ "$provides" != '' ]; then provides+=", " fi