From patchwork Tue Oct 25 07:15:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1694190 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=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=dPGSERpg; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (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 4MxNXS3P6Tz23lF for ; Tue, 25 Oct 2022 18:16:23 +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 1onEAT-0008RK-Da; Tue, 25 Oct 2022 07:16:09 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1onEAR-0008Qi-Ha for kernel-team@lists.ubuntu.com; Tue, 25 Oct 2022 07:16:07 +0000 Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) (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-1.canonical.com (Postfix) with ESMTPS id 3EF57412D9 for ; Tue, 25 Oct 2022 07:16:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1666682167; bh=XSHIjhORK5k+slh7BqBNniJVL6/ZwPapAY7rMMXI+f4=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=dPGSERpgiOY0GAADURw2jXh+5YOmSEN7XE2SFMm9R5N+eWMv91baLwY5pSv2rvdO4 XzxU5H9YHMCcd8shZKykkBPYrbHRgV9opelo3iLLP9pnrVtQ/o7LAq69J1QAIykx3n JVYnGKG1bUtdjvA+cZ6/bsSvYZNTpR8myc6PfNAyF5bHcAcsRU0yEPttw4dWKJsHm9 1SMtqYkxEkPSxzkKB2HxxrQm2WxA6Rv/3X2ZbjI8WU4UddqSm9+6QGbmQmI/377xNy Q+YNApBEmEz9DZGIh7ekx0/nfE+C9BJNQ2xTRxlM4yvzykjm3dw/MI27Y9YBcYlIbr iWJrmB9Y/Fqkg== Received: by mail-ej1-f70.google.com with SMTP id qw17-20020a1709066a1100b0078e25b6a52fso2228362ejc.3 for ; Tue, 25 Oct 2022 00:16:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XSHIjhORK5k+slh7BqBNniJVL6/ZwPapAY7rMMXI+f4=; b=V1IXI5Haa0/5jUY9vPzpiaUSRSKXpZjNxXDDL6Iva3iml/moG1WNGGH7WpOMSN3CEj EcAWSn7Svs03/AjZwHTeuUz0fNY9Q3k9PGr+TfL5n0c7bPPXt7/db8ynHncXfS35N+uD OWXhaDSri90jqIajFFhEq2hnOeUfyJIi0uAMMyP6BQuwbUsdG6IJlsnXWkvRj9qNYXof 7BNR+A6km4hZYaWbHHR+YwX9+NbQS13ud/4Q3a8Ao5ZtrnTXIQOdGdS27+8Nr+G3H/lC Oa8fFV0PO+5KoVHQeHt2jM0KupQSH6SByWXyiga1MqBR/kGODd6F9cdm5IiLiVRGkmcp /3iw== X-Gm-Message-State: ACrzQf0yKfp2c/rEoOo0q2zJ5YZ9f9ksnx24EJ2QPvJ8Ui8dvR2AYFPm HpX9UJa+c+l9huuPO0DXYCEjHXUl7SY1+rQi5amTqNTpNSB2KzKvNkVznrJdR1cQp/LXkPTAHJF 5D5MmbbJ4kNE9C6ZZG7SstdatUPV0U54MYQilCGhnVQ== X-Received: by 2002:a05:6402:5485:b0:459:147a:d902 with SMTP id fg5-20020a056402548500b00459147ad902mr35649380edb.263.1666682165869; Tue, 25 Oct 2022 00:16:05 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5X5bYvjgjHiQEICxMXrThLMub5kipFHA/w2gCevMU2N4I4x35Iunq9xjFMlxEZ/XPfa1J2gA== X-Received: by 2002:a05:6402:5485:b0:459:147a:d902 with SMTP id fg5-20020a056402548500b00459147ad902mr35649359edb.263.1666682165633; Tue, 25 Oct 2022 00:16:05 -0700 (PDT) Received: from localhost ([62.168.35.11]) by smtp.gmail.com with ESMTPSA id e5-20020aa7d7c5000000b004614fd33789sm1094111eds.18.2022.10.25.00.16.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Oct 2022 00:16:05 -0700 (PDT) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [SRU][K linux-gcp][PATCH] UBUNTU: [Packaging] remove circular dep between modules and image Date: Tue, 25 Oct 2022 09:15:59 +0200 Message-Id: <20221025071604.702-4-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221025071604.702-1-dimitri.ledkov@canonical.com> References: <20221025071604.702-1-dimitri.ledkov@canonical.com> 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: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Currently we have circular dependencies between linux-image and linux-modules/linux-modules-extra packages. This is redundant, and harmful when additional types of linux-images are provided (i.e. kernel.efi). Break the circular dependency by only keeping linux-image -> linux-modules dep, remove linux-modules -> linux-image dep, remove linux-modules-extra -> linux-image dep, add linux-modules-extra -> linux-modules dep. BugLink: https://bugs.launchpad.net/bugs/1989334 Signed-off-by: Dimitri John Ledkov --- debian.gcp/control.d/flavour-control.stub | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian.gcp/control.d/flavour-control.stub b/debian.gcp/control.d/flavour-control.stub index 59c99c818242..929f62d15801 100644 --- a/debian.gcp/control.d/flavour-control.stub +++ b/debian.gcp/control.d/flavour-control.stub @@ -46,13 +46,13 @@ Description: Linux kernel image for version PKGVER on DESC Package: linux-modules-PKGVER-ABINUM-FLAVOUR Build-Profiles: Architecture: ARCH Section: kernel Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-PKGVER-ABINUM-FLAVOUR | linux-image-unsigned-PKGVER-ABINUM-FLAVOUR +Depends: ${misc:Depends}, ${shlibs:Depends} Built-Using: ${linux:BuiltUsing} Description: Linux kernel extra modules for version PKGVER on DESC Contains the corresponding System.map file, the modules built by the packager, and scripts that try to ensure that the system is not left in an unbootable state after an update. . @@ -66,13 +66,13 @@ Description: Linux kernel extra modules for version PKGVER on DESC Package: linux-modules-extra-PKGVER-ABINUM-FLAVOUR Build-Profiles: Architecture: ARCH Section: kernel Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-PKGVER-ABINUM-FLAVOUR | linux-image-unsigned-PKGVER-ABINUM-FLAVOUR, wireless-regdb +Depends: ${misc:Depends}, ${shlibs:Depends}, wireless-regdb, linux-modules-PKGVER-ABINUM-FLAVOUR Description: Linux kernel extra modules for version PKGVER on DESC This package contains the Linux kernel extra modules for version PKGVER on DESC. . Also includes the corresponding System.map file, the modules built by the packager, and scripts that try to ensure that the system is not left in an