From patchwork Tue Jul 2 16:20:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timo Aaltonen X-Patchwork-Id: 1955516 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=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (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 4WD7TK55qMz1xpN for ; Wed, 3 Jul 2024 02:21:40 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1sOgG0-0003vd-NG; Tue, 02 Jul 2024 16:21:28 +0000 Received: from smtp-relay-canonical-1.internal ([10.131.114.174] helo=smtp-relay-canonical-1.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1sOgFy-0003ul-B5 for kernel-team@lists.ubuntu.com; Tue, 02 Jul 2024 16:21:26 +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 0BEB240D51 for ; Tue, 2 Jul 2024 16:21:25 +0000 (UTC) From: Timo Aaltonen To: kernel-team@lists.ubuntu.com Subject: [SRU][J/hwe-6.8-meta][PATCH 1/2] UBUNTU: [Packaging] Migrate oem-22.04* to hwe-22.04. Date: Tue, 2 Jul 2024 19:20:53 +0300 Message-ID: <20240702162054.4072140-2-tjaalton@ubuntu.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240702162054.4072140-1-tjaalton@ubuntu.com> References: <20240702162054.4072140-1-tjaalton@ubuntu.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" From: Timo Aaltonen BugLink: https://bugs.launchpad.net/bugs/1786013 Signed-off-by: Timo Aaltonen --- debian/control.d/migrate-oem-22.04 | 76 +++++++++++++++++++++++++++++ debian/control.d/migrate-oem-22.04a | 60 +++++++++++++++++++++++ debian/control.d/migrate-oem-22.04b | 60 +++++++++++++++++++++++ debian/control.d/migrate-oem-22.04c | 60 +++++++++++++++++++++++ debian/control.d/migrate-oem-22.04d | 76 +++++++++++++++++++++++++++++ 5 files changed, 332 insertions(+) create mode 100644 debian/control.d/migrate-oem-22.04 create mode 100644 debian/control.d/migrate-oem-22.04a create mode 100644 debian/control.d/migrate-oem-22.04b create mode 100644 debian/control.d/migrate-oem-22.04c create mode 100644 debian/control.d/migrate-oem-22.04d diff --git a/debian/control.d/migrate-oem-22.04 b/debian/control.d/migrate-oem-22.04 new file mode 100644 index 0000000..0164276 --- /dev/null +++ b/debian/control.d/migrate-oem-22.04 @@ -0,0 +1,76 @@ +# +# Generated using kteam-tools script: +# generate-transitions --input ../linux-meta-oem-6.5/debian/control --output debian/control.d/migrate-oem-22.04 oem-22.04 -generic${variant:suffix} +# +Package: linux-headers-oem-22.04 +Architecture: amd64 +Section: oldlibs +Multi-Arch: no +Depends: linux-headers-generic${variant:suffix} +Description: OEM Linux kernel headers (transitional package) + Transitional package for upgrades. This package can be safely removed. + +Package: linux-image-oem-22.04 +Architecture: amd64 +Section: oldlibs +Multi-Arch: no +Depends: linux-image-generic${variant:suffix} +Description: OEM Linux kernel image (transitional package) + Transitional package for upgrades. This package can be safely removed. + +Package: linux-image-uc-oem-22.04 +Architecture: amd64 +Section: oldlibs +Multi-Arch: no +Depends: linux-image-uc-generic${variant:suffix} +Description: Oem Linux kernel image for Ubuntu Core (transitional package) + Transitional package for upgrades. This package can be safely removed. + +Package: linux-tools-oem-22.04 +Architecture: amd64 +Section: oldlibs +Multi-Arch: no +Depends: linux-tools-generic${variant:suffix} +Description: OEM Linux kernel tools (transitional package) + Transitional package for upgrades. This package can be safely removed. + +Package: linux-oem-22.04 +Architecture: amd64 +Section: oldlibs +Multi-Arch: no +Depends: linux-generic${variant:suffix} +Description: Complete OEM Linux kernel and headers (transitional package) + Transitional package for upgrades. This package can be safely removed. + +Package: linux-modules-ipu6-oem-22.04 +Architecture: amd64 +Section: oldlibs +Multi-Arch: no +Depends: linux-modules-ipu6-generic${variant:suffix} +Description: Extra drivers for ipu6 for the oem flavour (transitional package) + Transitional package for upgrades. This package can be safely removed. + +Package: linux-modules-ivsc-oem-22.04 +Architecture: amd64 +Section: oldlibs +Multi-Arch: no +Depends: linux-image-generic${variant:suffix} +Description: Extra drivers for ivsc for the oem flavour (transitional package) + Transitional package for upgrades. This package can be safely removed. + +Package: linux-modules-iwlwifi-oem-22.04 +Architecture: amd64 +Section: oldlibs +Multi-Arch: no +Depends: linux-modules-iwlwifi-generic${variant:suffix} +Description: Extra drivers for iwlwifi for the oem flavour (transitional package) + Transitional package for upgrades. This package can be safely removed. + +Package: linux-modules-usbio-oem-22.04 +Architecture: amd64 +Section: oldlibs +Multi-Arch: no +Depends: linux-modules-usbio-generic${variant:suffix} +Description: Extra drivers for usbio for the oem flavour (transitional package) + Transitional package for upgrades. This package can be safely removed. + diff --git a/debian/control.d/migrate-oem-22.04a b/debian/control.d/migrate-oem-22.04a new file mode 100644 index 0000000..2e5a361 --- /dev/null +++ b/debian/control.d/migrate-oem-22.04a @@ -0,0 +1,60 @@ +# +# Generated using kteam-tools script: +# generate-transitions --input ../linux-meta-oem-5.17/debian/control --output debian/control.d/migrate-oem-22.04a oem-22.04a -generic${variant:suffix} +# +Package: linux-headers-oem-22.04a +Architecture: amd64 +Section: oldlibs +Multi-Arch: no +Depends: linux-headers-generic${variant:suffix} +Description: OEM Linux kernel headers (transitional package) + Transitional package for upgrades. This package can be safely removed. + +Package: linux-image-oem-22.04a +Architecture: amd64 +Section: oldlibs +Multi-Arch: no +Depends: linux-image-generic${variant:suffix} +Description: OEM Linux kernel image (transitional package) + Transitional package for upgrades. This package can be safely removed. + +Package: linux-tools-oem-22.04a +Architecture: amd64 +Section: oldlibs +Multi-Arch: no +Depends: linux-tools-generic${variant:suffix} +Description: OEM Linux kernel tools (transitional package) + Transitional package for upgrades. This package can be safely removed. + +Package: linux-oem-22.04a +Architecture: amd64 +Section: oldlibs +Multi-Arch: no +Depends: linux-generic${variant:suffix} +Description: Complete OEM Linux kernel and headers (transitional package) + Transitional package for upgrades. This package can be safely removed. + +Package: linux-modules-ipu6-oem-22.04a +Architecture: amd64 +Section: oldlibs +Multi-Arch: no +Depends: linux-modules-ipu6-generic${variant:suffix} +Description: Extra drivers for ipu6 for the oem flavour (transitional package) + Transitional package for upgrades. This package can be safely removed. + +Package: linux-modules-ivsc-oem-22.04a +Architecture: amd64 +Section: oldlibs +Multi-Arch: no +Depends: linux-image-generic${variant:suffix} +Description: Extra drivers for ivsc for the oem flavour (transitional package) + Transitional package for upgrades. This package can be safely removed. + +Package: linux-modules-iwlwifi-oem-22.04a +Architecture: amd64 +Section: oldlibs +Multi-Arch: no +Depends: linux-modules-iwlwifi-generic${variant:suffix} +Description: Extra drivers for iwlwifi for the oem flavour (transitional package) + Transitional package for upgrades. This package can be safely removed. + diff --git a/debian/control.d/migrate-oem-22.04b b/debian/control.d/migrate-oem-22.04b new file mode 100644 index 0000000..bae90b2 --- /dev/null +++ b/debian/control.d/migrate-oem-22.04b @@ -0,0 +1,60 @@ +# +# Generated using kteam-tools script: +# generate-transitions --input ../linux-meta-oem-6.0/debian/control --output debian/control.d/migrate-oem-22.04b oem-22.04b -generic${variant:suffix} +# +Package: linux-headers-oem-22.04b +Architecture: amd64 +Section: oldlibs +Multi-Arch: no +Depends: linux-headers-generic${variant:suffix} +Description: OEM Linux kernel headers (transitional package) + Transitional package for upgrades. This package can be safely removed. + +Package: linux-image-oem-22.04b +Architecture: amd64 +Section: oldlibs +Multi-Arch: no +Depends: linux-image-generic${variant:suffix} +Description: OEM Linux kernel image (transitional package) + Transitional package for upgrades. This package can be safely removed. + +Package: linux-tools-oem-22.04b +Architecture: amd64 +Section: oldlibs +Multi-Arch: no +Depends: linux-tools-generic${variant:suffix} +Description: OEM Linux kernel tools (transitional package) + Transitional package for upgrades. This package can be safely removed. + +Package: linux-oem-22.04b +Architecture: amd64 +Section: oldlibs +Multi-Arch: no +Depends: linux-generic${variant:suffix} +Description: Complete OEM Linux kernel and headers (transitional package) + Transitional package for upgrades. This package can be safely removed. + +Package: linux-modules-ipu6-oem-22.04b +Architecture: amd64 +Section: oldlibs +Multi-Arch: no +Depends: linux-modules-ipu6-generic${variant:suffix} +Description: Extra drivers for ipu6 for the oem flavour (transitional package) + Transitional package for upgrades. This package can be safely removed. + +Package: linux-modules-ivsc-oem-22.04b +Architecture: amd64 +Section: oldlibs +Multi-Arch: no +Depends: linux-image-generic${variant:suffix} +Description: Extra drivers for ivsc for the oem flavour (transitional package) + Transitional package for upgrades. This package can be safely removed. + +Package: linux-modules-iwlwifi-oem-22.04b +Architecture: amd64 +Section: oldlibs +Multi-Arch: no +Depends: linux-modules-iwlwifi-generic${variant:suffix} +Description: Extra drivers for iwlwifi for the oem flavour (transitional package) + Transitional package for upgrades. This package can be safely removed. + diff --git a/debian/control.d/migrate-oem-22.04c b/debian/control.d/migrate-oem-22.04c new file mode 100644 index 0000000..4828962 --- /dev/null +++ b/debian/control.d/migrate-oem-22.04c @@ -0,0 +1,60 @@ +# +# Generated using kteam-tools script: +# generate-transitions --input ../linux-meta-oem-6.1/debian/control --output debian/control.d/migrate-oem-22.04c oem-22.04c -generic${variant:suffix} +# +Package: linux-headers-oem-22.04c +Architecture: amd64 +Section: oldlibs +Multi-Arch: no +Depends: linux-headers-generic${variant:suffix} +Description: OEM Linux kernel headers (transitional package) + Transitional package for upgrades. This package can be safely removed. + +Package: linux-image-oem-22.04c +Architecture: amd64 +Section: oldlibs +Multi-Arch: no +Depends: linux-image-generic${variant:suffix} +Description: OEM Linux kernel image (transitional package) + Transitional package for upgrades. This package can be safely removed. + +Package: linux-tools-oem-22.04c +Architecture: amd64 +Section: oldlibs +Multi-Arch: no +Depends: linux-tools-generic${variant:suffix} +Description: OEM Linux kernel tools (transitional package) + Transitional package for upgrades. This package can be safely removed. + +Package: linux-oem-22.04c +Architecture: amd64 +Section: oldlibs +Multi-Arch: no +Depends: linux-generic${variant:suffix} +Description: Complete OEM Linux kernel and headers (transitional package) + Transitional package for upgrades. This package can be safely removed. + +Package: linux-modules-ipu6-oem-22.04c +Architecture: amd64 +Section: oldlibs +Multi-Arch: no +Depends: linux-modules-ipu6-generic${variant:suffix} +Description: Extra drivers for ipu6 for the oem flavour (transitional package) + Transitional package for upgrades. This package can be safely removed. + +Package: linux-modules-ivsc-oem-22.04c +Architecture: amd64 +Section: oldlibs +Multi-Arch: no +Depends: linux-image-generic${variant:suffix} +Description: Extra drivers for ivsc for the oem flavour (transitional package) + Transitional package for upgrades. This package can be safely removed. + +Package: linux-modules-iwlwifi-oem-22.04c +Architecture: amd64 +Section: oldlibs +Multi-Arch: no +Depends: linux-modules-iwlwifi-generic${variant:suffix} +Description: Extra drivers for iwlwifi for the oem flavour (transitional package) + Transitional package for upgrades. This package can be safely removed. + diff --git a/debian/control.d/migrate-oem-22.04d b/debian/control.d/migrate-oem-22.04d new file mode 100644 index 0000000..aa946ac --- /dev/null +++ b/debian/control.d/migrate-oem-22.04d @@ -0,0 +1,76 @@ +# +# Generated using kteam-tools script: +# generate-transitions --input ../linux-meta-oem-6.5/debian/control --output debian/control.d/migrate-oem-22.04d oem-22.04d -generic${variant:suffix} +# +Package: linux-headers-oem-22.04d +Architecture: amd64 +Section: oldlibs +Multi-Arch: no +Depends: linux-headers-generic${variant:suffix} +Description: OEM Linux kernel headers (transitional package) + Transitional package for upgrades. This package can be safely removed. + +Package: linux-image-oem-22.04d +Architecture: amd64 +Section: oldlibs +Multi-Arch: no +Depends: linux-image-generic${variant:suffix} +Description: OEM Linux kernel image (transitional package) + Transitional package for upgrades. This package can be safely removed. + +Package: linux-image-uc-oem-22.04d +Architecture: amd64 +Section: oldlibs +Multi-Arch: no +Depends: linux-image-uc-generic${variant:suffix} +Description: Oem Linux kernel image for Ubuntu Core (transitional package) + Transitional package for upgrades. This package can be safely removed. + +Package: linux-tools-oem-22.04d +Architecture: amd64 +Section: oldlibs +Multi-Arch: no +Depends: linux-tools-generic${variant:suffix} +Description: OEM Linux kernel tools (transitional package) + Transitional package for upgrades. This package can be safely removed. + +Package: linux-oem-22.04d +Architecture: amd64 +Section: oldlibs +Multi-Arch: no +Depends: linux-generic${variant:suffix} +Description: Complete OEM Linux kernel and headers (transitional package) + Transitional package for upgrades. This package can be safely removed. + +Package: linux-modules-ipu6-oem-22.04d +Architecture: amd64 +Section: oldlibs +Multi-Arch: no +Depends: linux-modules-ipu6-generic${variant:suffix} +Description: Extra drivers for ipu6 for the oem flavour (transitional package) + Transitional package for upgrades. This package can be safely removed. + +Package: linux-modules-ivsc-oem-22.04d +Architecture: amd64 +Section: oldlibs +Multi-Arch: no +Depends: linux-image-generic${variant:suffix} +Description: Extra drivers for ivsc for the oem flavour (transitional package) + Transitional package for upgrades. This package can be safely removed. + +Package: linux-modules-iwlwifi-oem-22.04d +Architecture: amd64 +Section: oldlibs +Multi-Arch: no +Depends: linux-modules-iwlwifi-generic${variant:suffix} +Description: Extra drivers for iwlwifi for the oem flavour (transitional package) + Transitional package for upgrades. This package can be safely removed. + +Package: linux-modules-usbio-oem-22.04d +Architecture: amd64 +Section: oldlibs +Multi-Arch: no +Depends: linux-modules-usbio-generic${variant:suffix} +Description: Extra drivers for usbio for the oem flavour (transitional package) + Transitional package for upgrades. This package can be safely removed. + From patchwork Tue Jul 2 16:20:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timo Aaltonen X-Patchwork-Id: 1955515 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=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (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 4WD7TK5jFLz1xqf for ; Wed, 3 Jul 2024 02:21:40 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1sOgFz-0003vF-Gi; Tue, 02 Jul 2024 16:21:27 +0000 Received: from smtp-relay-canonical-1.internal ([10.131.114.174] helo=smtp-relay-canonical-1.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1sOgFy-0003ut-Jq for kernel-team@lists.ubuntu.com; Tue, 02 Jul 2024 16:21:26 +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 821453F326 for ; Tue, 2 Jul 2024 16:21:25 +0000 (UTC) From: Timo Aaltonen To: kernel-team@lists.ubuntu.com Subject: [SRU][J/hwe-6.8-lrm][PATCH 2/2] UBUNTU: [Packaging] Migrate oem-22.04* to generic-22.04 Date: Tue, 2 Jul 2024 19:20:54 +0300 Message-ID: <20240702162054.4072140-3-tjaalton@ubuntu.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240702162054.4072140-1-tjaalton@ubuntu.com> References: <20240702162054.4072140-1-tjaalton@ubuntu.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" From: Timo Aaltonen BugLink: https://bugs.launchpad.net/bugs/1786013 Signed-off-by: Timo Aaltonen --- debian/package.config | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/debian/package.config b/debian/package.config index c592fd5..d737e5f 100644 --- a/debian/package.config +++ b/debian/package.config @@ -26,3 +26,42 @@ transitional 535-oem-22.04d 535-generic-hwe-24.04 amd64 transitional 535-open-oem-22.04d 535-open-generic-hwe-24.04 amd64 transitional 545-oem-22.04d 545-generic-hwe-24.04 amd64 transitional 545-open-oem-22.04d 545-open-generic-hwe-24.04 amd64 +migrate 470 oem-22.04 generic${variant:suffix} amd64 +migrate 525 oem-22.04 generic${variant:suffix} amd64 +migrate 525-open oem-22.04 generic${variant:suffix} amd64 +migrate 535 oem-22.04 generic${variant:suffix} amd64 +migrate 535-open oem-22.04 generic${variant:suffix} amd64 +migrate 545 oem-22.04 generic${variant:suffix} amd64 +migrate 545-open oem-22.04 generic${variant:suffix} amd64 +migrate 550 oem-22.04 generic${variant:suffix} amd64 +migrate 550-open oem-22.04 generic${variant:suffix} amd64 +migrate 470 oem-22.04a generic${variant:suffix} amd64 +migrate 525 oem-22.04a generic${variant:suffix} amd64 +migrate 525-open oem-22.04a generic${variant:suffix} amd64 +migrate 535 oem-22.04a generic${variant:suffix} amd64 +migrate 535-open oem-22.04a generic${variant:suffix} amd64 +migrate 545 oem-22.04a generic${variant:suffix} amd64 +migrate 545-open oem-22.04a generic${variant:suffix} amd64 +migrate 470 oem-22.04b generic${variant:suffix} amd64 +migrate 525 oem-22.04b generic${variant:suffix} amd64 +migrate 525-open oem-22.04b generic${variant:suffix} amd64 +migrate 535 oem-22.04b generic${variant:suffix} amd64 +migrate 535-open oem-22.04b generic${variant:suffix} amd64 +migrate 545 oem-22.04b generic${variant:suffix} amd64 +migrate 545-open oem-22.04b generic${variant:suffix} amd64 +migrate 470 oem-22.04c generic${variant:suffix} amd64 +migrate 525 oem-22.04c generic${variant:suffix} amd64 +migrate 525-open oem-22.04c generic${variant:suffix} amd64 +migrate 535 oem-22.04c generic${variant:suffix} amd64 +migrate 535-open oem-22.04c generic${variant:suffix} amd64 +migrate 545 oem-22.04c generic${variant:suffix} amd64 +migrate 545-open oem-22.04c generic${variant:suffix} amd64 +migrate 470 oem-22.04d generic${variant:suffix} amd64 +migrate 525 oem-22.04d generic${variant:suffix} amd64 +migrate 525-open oem-22.04d generic${variant:suffix} amd64 +migrate 535 oem-22.04d generic${variant:suffix} amd64 +migrate 535-open oem-22.04d generic${variant:suffix} amd64 +migrate 545 oem-22.04d generic${variant:suffix} amd64 +migrate 545-open oem-22.04d generic${variant:suffix} amd64 +migrate 550 oem-22.04d generic${variant:suffix} amd64 +migrate 550-open oem-22.04d generic${variant:suffix} amd64