From patchwork Tue Oct 25 07:16:00 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: 1694188 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=vFEsiRWN; 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 4MxNXS4ZKMz23lG 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 1onEAV-0008SA-Ly; Tue, 25 Oct 2022 07:16:11 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1onEAS-0008Qz-62 for kernel-team@lists.ubuntu.com; Tue, 25 Oct 2022 07:16:08 +0000 Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.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 EC62E42407 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=KLaKMzo4i5f7U3Q2q1ZtP8SRY3QWXO+GGm2UYCGBs6A=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=vFEsiRWNY3rql1zGf2z2UgCcZGIApAq3tCcjoGDS8/jDUVBf7Fms9pu7S7Vmsg44i j6z8PeTBhnyhsRLBBZDj/n6Wz1s/eVlrE6fu6SxSSLRLHvSEeC42zUUYBLmjq69+jI yIo5A3LK0VFmeeUgWOohqdEf8NM+9ldsT2CDud4Tn7EsBHa3IZQ4RKiapaSSncX3CM iJRNuNPwOUQM959c1ke3UVQBBevIM+QDWbG3MMTTSZyyNvfyMJeCvayfTSEc2QR1ce EDrsym1YEdMwK2i7f2Dk0mOEjNn5c1uktPNfrlroeh4GjXCARAHAiSKUHOZse2snFi VVtdaagpmgbdw== Received: by mail-ej1-f71.google.com with SMTP id sb13-20020a1709076d8d00b0078d8e1f6f7aso2229677ejc.8 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=KLaKMzo4i5f7U3Q2q1ZtP8SRY3QWXO+GGm2UYCGBs6A=; b=kfZ+ZVuRVKx/Y2ux3RPaMD9G2+J5LQrkLQRkoskaTPWXny9Tf3Csf4vcjYvpaqY6Tn VojIi0cLTGUom65lhqlCxFQRtvJbTutcV1tomWVXroO2UZiDQ6x/ssmyj2JdXopTJ3Dr XoBdjA6knfXJE3RaQfIdPexuiQTOmEFT4+GZzkRbvXyadqI2vH4MSyPadxSetCkTnKzx COdXrUevsdi5s0xJNivQvrmkMfeH6FpjS4NBapPu+n4MVbHICtWcpizWkRDvis+xbdbQ 0fEiQx9H+Zy5/SsMieOlIDmLD4CtVZ4Sc4d3lG+KRGFOpvyug1OjdFtVRXbzKMJVJOXV AvVw== X-Gm-Message-State: ACrzQf194rnaAPa8NvWJcpi7ZzawHSxFrQjnTb0RlRgAqf6Y9+1q6cuY Ime2jkhKCH8NIV/Hb77uwKMMzNA5A1VLW27BfMXZEvHfcZMrSM8ohYkL2xW2XaZnhvLyw+SDvKs AAKkW26V1eB7ZM2dgP/sdGtMLl0Abp7pBNQvw2QNaMw== X-Received: by 2002:a17:907:94d1:b0:790:65a:3a18 with SMTP id dn17-20020a17090794d100b00790065a3a18mr30271917ejc.428.1666682167247; Tue, 25 Oct 2022 00:16:07 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7HFlHcbl9j0gyozLB0YmoZFDn+Eooy+gOGCFMVn7XVsWuwV29n84heRO8wl7BnmRA8ZfSg+Q== X-Received: by 2002:a17:907:94d1:b0:790:65a:3a18 with SMTP id dn17-20020a17090794d100b00790065a3a18mr30271901ejc.428.1666682166984; Tue, 25 Oct 2022 00:16:06 -0700 (PDT) Received: from localhost ([62.168.35.11]) by smtp.gmail.com with ESMTPSA id k7-20020a508ac7000000b0045b910b0542sm1083715edk.15.2022.10.25.00.16.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Oct 2022 00:16:06 -0700 (PDT) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [SRU][K linux-ibm][PATCH] UBUNTU: [Packaging] remove circular dep between modules and image Date: Tue, 25 Oct 2022 09:16:00 +0200 Message-Id: <20221025071604.702-5-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.ibm/control.d/flavour-control.stub | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian.ibm/control.d/flavour-control.stub b/debian.ibm/control.d/flavour-control.stub index d59a64bd2c3c..c3d0df943fc5 100644 --- a/debian.ibm/control.d/flavour-control.stub +++ b/debian.ibm/control.d/flavour-control.stub @@ -65,13 +65,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 +Depends: ${misc:Depends}, ${shlibs:Depends}, 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