From 124e1feded558ecef7b600ab92f6f20d81d9bf38 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@brickies.net>
Date: Mon, 8 May 2023 12:27:02 -0400
Subject: [PATCH 1/2] Update kernel version.

These are the current version you will get on Ubuntu 22.04 with

   apt-get install linux-image-generic
---
 bin/build-release | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/build-release b/bin/build-release
index 52220be..a9be623 100755
--- a/bin/build-release
+++ b/bin/build-release
@@ -30,7 +30,7 @@ shift
 pre=cirros-$VER
 BR_VER="${BR_VER:-2022.02.4}" # WARNING: this may be non-trivial to change
 ARCHES="${ARCHES:-x86_64 arm aarch64 ppc64le}"
-KVER="${KVER:-5.15.0-48.54}" # Ubuntu 22.04
+KVER="${KVER:-5.15.0-71.78}" # Ubuntu 22.04
 GVER="${GVER:-2.06-2ubuntu7}" # Ubuntu 22.04
 ME=$(readlink -f "$0")
 MY_D=${ME%/*}

From a7f0fe3cffdd669b7a0abef21be6868fa15e40ea Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@brickies.net>
Date: Mon, 8 May 2023 13:11:33 -0400
Subject: [PATCH 2/2] Update grub versions, intruduce GVER_UNSIGNED

In 22.04, grub2 package in ubuntu does not build a 'grub-efi-<arch>-bin'
package for amd64 and arm64. Instead, those binaries are built by
the grub2-unsigned source package.

So identify this fact in the bin/build-release code.

From https://launchpad.net/ubuntu/+source/grub2-unsigned
and https://launchpad.net/ubuntu/+source/grub2
---
 bin/build-release | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/bin/build-release b/bin/build-release
index a9be623..030deaa 100755
--- a/bin/build-release
+++ b/bin/build-release
@@ -31,7 +31,8 @@ pre=cirros-$VER
 BR_VER="${BR_VER:-2022.02.4}" # WARNING: this may be non-trivial to change
 ARCHES="${ARCHES:-x86_64 arm aarch64 ppc64le}"
 KVER="${KVER:-5.15.0-71.78}" # Ubuntu 22.04
-GVER="${GVER:-2.06-2ubuntu7}" # Ubuntu 22.04
+GVER="${GVER:-2.06-2ubuntu7.1}" # Ubuntu 22.04 grub2
+GVER_UNSIGNED="${GVER_UNSIGNED:-2.06-2ubuntu14.1}" # Ubuntu 22.04 grub2-unsigned
 ME=$(readlink -f "$0")
 MY_D=${ME%/*}
 PATH=${MY_D}:$PATH
@@ -122,6 +123,15 @@ get_grub_format() {
     echo $format
 }
 
+get_grub_version() {
+    local arch=$1 ver=""
+    case "$arch" in
+        x86_64|aarch64) ver="${GVER_UNSIGNED}";;
+        *) ver="$GVER";;
+    esac
+    echo "$ver"
+}
+
 get_img_size() {
     local arch=$1
     case "$arch" in
@@ -192,7 +202,7 @@ for arch in ${ARCHES}; do
     mkdir -p "$OUT/stage/$arch"
 
     kver=$KVER
-    gver=$GVER
+    gver=$(get_grub_version "$arch")
 
     # grab kernel
     logevent "start kernel ($arch) download" -