diff mbox series

ACK/Cmnt Re: [SRU][f:linux-restricted-modules-hwe-5.15][PATCH 0/1] Add lrm autogenerated transitional independent of variants

Message ID d5cd63cc-dff6-b795-ca4d-faa2913edb22@ubuntu.com
State New
Headers show
Series ACK/Cmnt Re: [SRU][f:linux-restricted-modules-hwe-5.15][PATCH 0/1] Add lrm autogenerated transitional independent of variants | expand

Commit Message

Timo Aaltonen March 27, 2023, 7:11 a.m. UTC 
Kleber Sacilotto de Souza kirjoitti 29.9.2022 klo 19.33:
> BugLink: https://bugs.launchpad.net/bugs/1991130
> 
> 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.
> 
> [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 <from> <to> <archs>
> 
> Example:
> 
> transitional 450-oem-20.04 450-generic amd64
> 
> When being processed by 'debian/scripts/gen-rules.lrm' 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/gen-rules.lrm | 21 +++++++++++++++++++++
>   1 file changed, 21 insertions(+)
> 

Hi,

So we're finally at the point where the migration from oem-5.14 to 
hwe-5.15 can happen. There's one change needed though, and that is to 
add a Provides to the transitionals. This was tested for the migration:



with this added, the patch is

Acked-by: Timo Aaltonen <timo.aaltonen@canonical.com>
diff mbox series

Patch

diff --git a/debian/scripts/gen-rules.lrm b/debian/scripts/gen-rules.lrm
index ebd17f1..805941d 100755
--- a/debian/scripts/gen-rules.lrm
+++ b/debian/scripts/gen-rules.lrm
@@ -230,7 +230,7 @@  done <"debian/package.config"
  while read command from to archs
  do
         case "$command" in
-       migrate)        ;;
+       migrate)        from_minus=$(echo "$from" | sed -e 's/-.*//');;
         *)              continue ;;
         esac

@@ -241,6 +241,7 @@  do
  Package: linux-modules-nvidia-${from}
  Architecture: ${archs}
  Section: oldlibs
+Provides: \${dkms:nvidia-${from_minus}-modules}, nvidia-prebuilt-kernel
  Depends: linux-modules-nvidia-${to}
  Description: Extra drivers for nvidia-${from} (dummy transitional package)
   Transitional package for upgrades of ${from} to ${to}.