From patchwork Thu Mar 30 12:57:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timo Aaltonen X-Patchwork-Id: 1763234 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=) 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 4PnNkZ0ptHz1yYx for ; Thu, 30 Mar 2023 23:57:57 +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 1phrqh-00074E-2u; Thu, 30 Mar 2023 12:57:51 +0000 Received: from smtp-relay-canonical-1.internal ([10.131.114.174] helo=smtp-relay-canonical-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 1phrqf-00073x-CO for kernel-team@lists.ubuntu.com; Thu, 30 Mar 2023 12:57:49 +0000 Received: from localhost.localdomain (1.general.tjaalton.uk.vpn [10.172.193.56]) (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-canonical-1.canonical.com (Postfix) with ESMTPSA id 292983FBEE for ; Thu, 30 Mar 2023 12:57:48 +0000 (UTC) From: Timo Aaltonen To: kernel-team@lists.ubuntu.com Subject: [SRU v2][f:linux-restricted-modules-hwe-5.15/unstable:linux-restricted-modules][PATCH 0/1] Add lrm autogenerated transitional independent of variants Date: Thu, 30 Mar 2023 15:57:38 +0300 Message-Id: <20230330125739.876314-1-tjaalton@ubuntu.com> X-Mailer: git-send-email 2.39.2 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" From: Timo Aaltonen BugLink: https://bugs.launchpad.net/bugs/1991130 Old Note: this patch is supposed to be applied to all lrm packages (or at least to hwe and generic) but I'm proposing for f:lrm-hwe-5.15 only for now to fix the transition from f:oem-5.14. If this works well I will send it again to be applied to other lrm packages. New Note: added unstable, patch rebased and amended [Impact] The kernel lrm packages have a mechanism to auto-generate transitional packages by adding a line to 'debian/package.config' in the following format transitional Example: transitional 450-oem-20.04 450-generic amd64 When being processed by 'debian/scripts/generate-rules' the autogenerated contents are added to 'debian/control.d/transitionals-local'. However, this file is not included in the final 'debian/control' for packages which does not contain the default variant '--' (see debian/rules.in). This is intentional to prevent unwanted transitionals. However, there are some cases where we want to transition packages to kernels which are not the default variant in a series (e.g. hwe kernels). [Fix] The proposed fix is to add a new command "migrate", which does exactly what "transitional" does but adding the content to 'debian/control.d/migrate-local' which would get added to the final 'debian/control' independently of the source's variants. [Test Case] Add "migrate" entries to 'debian/package.config' and check whether they get added to 'debian/control' even for non default variant packages. [Where problems could occur] If not used correctly, unwanted transitionals could be generated causing issues to the archive. However, this is a new command and should not impact any of the previously set transitionals and it needs to be explicitly used. Kleber Sacilotto de Souza (1): UBUNTU: [Packaging] add a new migrate autogenerate option debian/scripts/generate-rules | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)