From patchwork Tue Oct 25 07:16:03 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: 1694192 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=e59B3PTr; 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 4MxNXT0T5wz23lJ for ; Tue, 25 Oct 2022 18:16:24 +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 1onEAZ-0008WG-To; Tue, 25 Oct 2022 07:16:15 +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 1onEAV-0008S9-Ku for kernel-team@lists.ubuntu.com; Tue, 25 Oct 2022 07:16:11 +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 6C026412D9 for ; Tue, 25 Oct 2022 07:16:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1666682171; bh=wISM043HpjZ1WBGzHChwMuPLbGJdSVu6WaE+nTs5D5I=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=e59B3PTrNnrv/i1Oi6LLIoJumJwpJHDUIseFcvlo9t+OucByoiYSP4kNbpyJvT9hM ldqa/sw1z+XA4oNA7YnDXeL5aNIZV7JKMbLjK9Ke1U+bpDbpEhJH7RJeljKOMnYXrZ AgABA6X2afjWiEA8/+U7k03qnsPY+3vqzDkYs+wA2m70uc7p45cVseWfs7d9GYIm/j 0uZ3bw1472XHnXcw0Ey6ugctkOvpfpE97bPRSdJD+UdP6tzGF/r4Jas79aP3hRZsL3 zH6nfY/QnvxbhZ0sKpeKDvqf4fXXnJ9xE+ASXctk5q1uJRohdM+st6Qvly+Mx/YAaw ljg5GkOHEBAUw== Received: by mail-ej1-f70.google.com with SMTP id nc4-20020a1709071c0400b0078a5ceb571bso2217223ejc.4 for ; Tue, 25 Oct 2022 00:16:11 -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=wISM043HpjZ1WBGzHChwMuPLbGJdSVu6WaE+nTs5D5I=; b=fO3bAuT+KZvjUtnsIKpPjyclrk9cmvVaFHehUbZ9tK/7yPLfYYgdRPG8ibzveVzNIz P49Pj9WxnNu//sd3ZlZ9s+uPrYNrbfDeJnDDt2Y5RGrslYEXHt994AqFRttmtoNXOUzo UoZkHiC8jJlowQOYGsZIYc3n+i5aS+GRCWE6XsLLN8BvScCFA7KECdpGtJ4QDuwE5H2r Gy84qNCxGA1C4j1/z7Wdpa/IL/q1u4t5H4qhewMUbeJrbU07fEqE9Gm7u8Yg9Gu0ZBe9 uhKK6OPtI7tIdBnTd9fH+fY0AUHroqR2sIkJb0u5Lu1dY05FjCtjCzv4EnengHJoZeri kufw== X-Gm-Message-State: ACrzQf3HQherFcEyLwenrsRY5j3mB/wnuSsH+Tf/na0Jaa82fUdbYfI2 yyu806OdbfCIv5Gt4Y1gk50j1M71TVSdjSMyJTbldChJF65BNyVGVDiE2K8e4OQE2pwHjryg7v3 UJYQRIkC50XbL5Un7zipYOQfbv/aPsUIrfQ3Ksck/SQ== X-Received: by 2002:a17:906:db0a:b0:781:f24:a782 with SMTP id xj10-20020a170906db0a00b007810f24a782mr30732524ejb.399.1666682170830; Tue, 25 Oct 2022 00:16:10 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6T1KJhiLKBW+cqxQuyLayK0SuyS4AqcHTp6d5t0nmTv1w9/puGhjZNDjpCCm29CIDYcN3bTg== X-Received: by 2002:a17:906:db0a:b0:781:f24:a782 with SMTP id xj10-20020a170906db0a00b007810f24a782mr30732510ejb.399.1666682170590; Tue, 25 Oct 2022 00:16:10 -0700 (PDT) Received: from localhost ([62.168.35.11]) by smtp.gmail.com with ESMTPSA id jt1-20020a170906dfc100b0073d796a1043sm891309ejc.123.2022.10.25.00.16.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Oct 2022 00:16:10 -0700 (PDT) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [SRU][K linux-oracle][PATCH] UBUNTU: [Packaging] remove circular dep between modules and image Date: Tue, 25 Oct 2022 09:16:03 +0200 Message-Id: <20221025071604.702-8-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.oracle/control.d/flavour-control.stub | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian.oracle/control.d/flavour-control.stub b/debian.oracle/control.d/flavour-control.stub index dba2bda9e337..1d658c4915fa 100644 --- a/debian.oracle/control.d/flavour-control.stub +++ b/debian.oracle/control.d/flavour-control.stub @@ -65,13 +65,13 @@ Description: Oracle 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: Oracle Linux kernel extra modules for version PKGVER on DESC This package contains the Oracle 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