From patchwork Tue Oct 25 07:16:02 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: 1694189 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=NlWa/g4i; 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 4MxNXS55jVz23lH 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 1onEAW-0008Tl-Vf; Tue, 25 Oct 2022 07:16:13 +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 1onEAU-0008Rm-B1 for kernel-team@lists.ubuntu.com; Tue, 25 Oct 2022 07:16:10 +0000 Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) (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 27C82412D9 for ; Tue, 25 Oct 2022 07:16:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1666682170; bh=1F1ITh35Es/hFlCI2WsgRsvGz9eaCz3v071snSjivTI=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=NlWa/g4iiy/KurPFd1QqE8aU3AVRVrO1JpJr6x/rbqaivIxEa1n5n2ePXNK66GoN2 SeauywtTKtvqjmGIGzdL+lPl3oF8a8tzJEBxoVuiMfl0J1VoUc4eKpuK6TyHN2sT0v gGi5t/waVW8OuR9H5ojgxY6ifiQq78x3cmziGX1Eh2Bs9S7L32OKNaY6oQRCvau+QI Wc42PLdRTLdPqBcioGv6rNZMFOR7bf0vpnm5ANJ56blItdqf/ys65Mqpzbz1JNw6iE p0d/Sc6gw8jE5waxZMgd7ZVNGYRB4DcYCas3R5sCcQffg/g4nbiMG1zPL6emMxGsEc 1R2KdxSU25FvA== Received: by mail-ej1-f72.google.com with SMTP id sd8-20020a1709076e0800b007ac2e1693abso578277ejc.13 for ; Tue, 25 Oct 2022 00:16:10 -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=1F1ITh35Es/hFlCI2WsgRsvGz9eaCz3v071snSjivTI=; b=X3FcRoscO7UVf/2GltudPcPo0SuWr+XPKNhN8vFc2G1CgcpKQqcRMeVDVwTlcIQuYa 3XfBjLlwqr92UgrzjWeS6GcL0JMpvdcVuLZCxqVW6XVqc1g1Sqvpq98BkMpVUeSyZDoh pP3xL+VNDiL68FiHanCBcB8PW4ByvB1wokHmQFUqwXldIFpE7GIYmRSBTNqEp6TTxA8d QKO3UQWt8cdsGPne6vX859SUwMQec3HhoRBbM/mZ9V2e/T9ST9y4uDTL6qAZ293uWGAE Rzc5YZfTPBQI53eWlv+S9FFkWNniSZTbs8jFIm0kLEZZBeXX9W4PCmhH6coCLBZjr2OR 61Rg== X-Gm-Message-State: ACrzQf3huBodS+yvsIv6fmfkiGH7110SjRl38lZQFkHg46ViF4LrhWAd mEPaPIGHXPug1OpzhG/nOZ+BXBfLWsGiuMezS21OV/EaZTs+xOZdafgXXHtxoinZ8K5Ra5dGRvq QvTT/yovjrR6fP0tEObHCxeX1ShpItR3vEAf8xvS7ow== X-Received: by 2002:a05:6402:371b:b0:460:ff7d:f511 with SMTP id ek27-20020a056402371b00b00460ff7df511mr24214351edb.148.1666682169521; Tue, 25 Oct 2022 00:16:09 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5JaKPho+PZSUDVZ1df9oij+jQ7krZ/NbxYdzzFXZJ6I0Tvx9bRgKKjTS+EedLtN0YRLQ+KyQ== X-Received: by 2002:a05:6402:371b:b0:460:ff7d:f511 with SMTP id ek27-20020a056402371b00b00460ff7df511mr24214328edb.148.1666682169230; Tue, 25 Oct 2022 00:16:09 -0700 (PDT) Received: from localhost ([62.168.35.11]) by smtp.gmail.com with ESMTPSA id kv12-20020a17090778cc00b0077b2b0563f4sm909973ejc.173.2022.10.25.00.16.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Oct 2022 00:16:08 -0700 (PDT) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [SRU][K linux-lowlatency][PATCH] UBUNTU: [Packaging] remove circular dep between modules and image Date: Tue, 25 Oct 2022 09:16:02 +0200 Message-Id: <20221025071604.702-7-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.lowlatency/control.d/flavour-control.stub | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian.lowlatency/control.d/flavour-control.stub b/debian.lowlatency/control.d/flavour-control.stub index 9fe268b333d7..71f252d4daae 100644 --- a/debian.lowlatency/control.d/flavour-control.stub +++ b/debian.lowlatency/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