UBUNTU: [Packaging] Allow grub-efi-arm* to satisfy recommends on ARM

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@canonical.com>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
[dannf: backport to focal by dropping generic-64k hunk]
Signed-off-by: dann frazier <dann.frazier@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

diff --git a/debian.master/control.d/vars.generic b/debian.master/control.d/vars.generic
index cd3698688d2dc61b691f85531976e4ef7f42b225..ca144cfac8962b31a10b32dceb22164d5437bb56 100644 (file)
--- 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-lpae b/debian.master/control.d/vars.generic-lpae
index 616a7a53040cb648ad0c9721d8d5b5b6a612d9b6..107ebc52a0b3ecc7cfb841034dc9b4ba05ceea88 100644 (file)
--- 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 6cef9f8ee0f169cf218b9a0550a7a4a882cd18b6..02af97ae921aad74acf015e48f31c3460e707146 100644 (file)
--- 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]"