Merge ~mfo/grub:lp1840560 into ~ubuntu-core-dev/grub/+git/ubuntu:ubuntu

[Mauricio Faria de Oliveira]

Fix "error: can't find command `hwmatch'." on non-i386/pc platforms such as x86_64/efi.
LP: #1840560

[Mauricio Faria de Oliveira (mfo)]

Rebased on top of latest grub on impish.

[Mauricio Faria de Oliveira (mfo)]

Updated changelog for jammy (new development release).

[Julian Andres Klode (juliank)]

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 043136b..ae31123 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+grub2 (2.04-1ubuntu48) jammy; urgency=medium
+
+  * d/p/0241-Call-hwmatch-only-on-the-grub-pc-platform.patch:
+    Fix "error: can't find command `hwmatch'." on non-i386/pc
+    platforms such as x86_64/efi. (LP: #1840560)
+
+ -- Mauricio Faria de Oliveira <[e-mail]>  Thu, 04 Nov 2021 10:48:06 -0300
+
 grub2 (2.04-1ubuntu47) impish; urgency=medium
 
   * Drop grub.cfg-400.patch (LP: #1933826)
diff --git a/debian/patches/0241-Call-hwmatch-only-on-the-grub-pc-platform.patch b/debian/patches/0241-Call-hwmatch-only-on-the-grub-pc-platform.patch
 new file mode 100644
index 0000000..9ae2fdf
--- /dev/null
+++ b/debian/patches/0241-Call-hwmatch-only-on-the-grub-pc-platform.patch
@@ -0,0 +1,47 @@
+From: Mauricio Faria de Oliveira <[e-mail]>
+Date: Fri, 20 Aug 2021 10:15:06 -0300
+Subject: Call hwmatch only on the grub-pc platform
+
+Call hwmatch only on i386/pc as it is only available there.
+This avoids "error: can't find command `hwmatch'." on e.g., x86_64/efi.
+
+The equivalent behavior is linux_gfx_mode=keep because grub is special:
+the `if hwmatch` clause is true on that error and `$match = 0` is true
+too, as it is undefined (confirmed in grub shell.) A quick fix for now.
+
+Before and After:
+
+    grub> hwmatch
+    error: can't find command `hwmatch'.
+
+    grub> echo $grub_platform
+    efi
+
+    grub> echo $linux_gfx_mode
+    keep
+
+Signed-off-by: Mauricio Faria de Oliveira <[e-mail]>
+
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1840560
+Bug-Debian: https://bugs.debian.org/990836
+Forwarded: no
+Last-Update: 2020-08-20
+---
+ util/grub.d/10_linux.in | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+index 47daf51..6aad5ba 100644
+--- a/util/grub.d/10_linux.in
++++ b/util/grub.d/10_linux.in
+@@ -378,7 +378,9 @@ else
+   cat << EOF
+ if [ "\${recordfail}" != 1 ]; then
+   if [ -e \${prefix}/gfxblacklist.txt ]; then
+-    if hwmatch \${prefix}/gfxblacklist.txt 3; then
++    if [ \${grub_platform} != pc ]; then
++      set linux_gfx_mode=keep
++    elif hwmatch \${prefix}/gfxblacklist.txt 3; then
+       if [ \${match} = 0 ]; then
+         set linux_gfx_mode=keep
+       else
diff --git a/debian/patches/series b/debian/patches/series
index 9b9ca92..11c2a0f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -237,3 +237,4 @@ cherry-fix-crash-on-http.patch
 0238-util-grub-install-Fix-NULL-pointer-dereferences.patch
 0239-arm-linux-Fix-ARM-Linux-header-layout.patch
 0240-tests-ahci_test.in-Replace-ide-drive-with-ide-hd.patch
+0241-Call-hwmatch-only-on-the-grub-pc-platform.patch