APPLIED (hirsute/5.11): [PATCH][Hirsute] UBUNTU: [Packaging] Allow grub-efi-arm* to satisfy recommends on ARM

[Andrea Righi]

Applied to hirsute/5.11.

Thanks,
-Andrea

On Fri, Mar 12, 2021 at 11:46:32AM -0700, dann frazier wrote:
> BugLink: https://bugs.launchpad.net/bugs/1918427
> 
> The only package that currently satisfies the bootloader Recommends
> relationship on ARM systems is flash-kernel. This ignores EFI-based systems,
> which will instead require GRUB. Allow the architecture-appropriate
> grub-efi-* package to also satisfy this relationship.
> 
> Note: I've ordered the Recommends options such that flash-kernel will
> remain the default choice if GRUB is not already installed, except for the
> 64K page flavor, which is more oriented towards servers that will
> almost certainly be using EFI.
> 
> Signed-off-by: dann frazier <dann.frazier at canonical.com>
> ---
>  debian.master/control.d/vars.generic      | 2 +-
>  debian.master/control.d/vars.generic-64k  | 2 +-
>  debian.master/control.d/vars.generic-lpae | 2 +-
>  debian.master/control.d/vars.lowlatency   | 2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/debian.master/control.d/vars.generic b/debian.master/control.d/vars.generic
> index cd3698688d2d..ca144cfac896 100644
> --- a/debian.master/control.d/vars.generic
> +++ b/debian.master/control.d/vars.generic
> @@ -2,5 +2,5 @@ arch="amd64 armhf arm64 ppc64el s390x"
>  supported="Generic"
>  target="Geared toward desktop and server systems."
>  desc="=HUMAN= SMP"
> -bootloader="grub-pc [amd64] | grub-efi-amd64 [amd64] | grub-efi-ia32 [amd64] | grub [amd64] | lilo [amd64] | flash-kernel [armhf arm64] | grub-ieee1275 [ppc64el]"
> +bootloader="grub-pc [amd64] | grub-efi-amd64 [amd64] | grub-efi-ia32 [amd64] | grub [amd64] | lilo [amd64] | flash-kernel [armhf arm64] | grub-efi-arm64 [arm64] | grub-efi-arm [armhf] | grub-ieee1275 [ppc64el]"
>  provides="kvm-api-4, redhat-cluster-modules, ivtv-modules, virtualbox-guest-modules [amd64]"
> diff --git a/debian.master/control.d/vars.generic-64k b/debian.master/control.d/vars.generic-64k
> index 91eb2863d942..82213f4803fc 100644
> --- a/debian.master/control.d/vars.generic-64k
> +++ b/debian.master/control.d/vars.generic-64k
> @@ -2,5 +2,5 @@ arch="arm64"
>  supported="Generic 64K pages"
>  target="Geared toward desktop and server systems."
>  desc="=HUMAN= SMP"
> -bootloader="flash-kernel [arm64]"
> +bootloader="grub-efi-arm64 [arm64] | flash-kernel [arm64]"
>  provides="kvm-api-4, redhat-cluster-modules, ivtv-modules"
> diff --git a/debian.master/control.d/vars.generic-lpae b/debian.master/control.d/vars.generic-lpae
> index 616a7a53040c..107ebc52a0b3 100644
> --- a/debian.master/control.d/vars.generic-lpae
> +++ b/debian.master/control.d/vars.generic-lpae
> @@ -2,5 +2,5 @@ arch="armhf"
>  supported="Generic LPAE"
>  target="Geared toward desktop and server systems."
>  desc="=HUMAN= SMP"
> -bootloader="flash-kernel [armhf]"
> +bootloader="flash-kernel [armhf] | grub-efi-arm [armhf]"
>  provides="kvm-api-4, redhat-cluster-modules, ivtv-modules"
> diff --git a/debian.master/control.d/vars.lowlatency b/debian.master/control.d/vars.lowlatency
> index 6cef9f8ee0f1..02af97ae921a 100644
> --- a/debian.master/control.d/vars.lowlatency
> +++ b/debian.master/control.d/vars.lowlatency
> @@ -2,5 +2,5 @@ arch="amd64"
>  supported="Lowlatency"
>  target="Geared toward desktop and server systems."
>  desc="=HUMAN= SMP"
> -bootloader="grub-pc [amd64] | grub-efi-amd64 [amd64] | grub-efi-ia32 [amd64] | grub [amd64] | lilo [amd64] | flash-kernel [armhf arm64]"
> +bootloader="grub-pc [amd64] | grub-efi-amd64 [amd64] | grub-efi-ia32 [amd64] | grub [amd64] | lilo [amd64] | flash-kernel [armhf arm64] | grub-efi-arm64 [arm64] | grub-efi-arm [armhf]"
>  provides="kvm-api-4, redhat-cluster-modules, ivtv-modules, virtualbox-guest-modules [amd64]"
> -- 
> 2.30.2
> 
> 
> -- 
> kernel-team mailing list
> kernel-team at lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team