Merge remote-tracking branch 'ikapelyukhin/focal-backport-arm64-secureboot' into ubuntu/focal

* ikapelyukhin/focal-backport-arm64-secureboot:
  Update debian/changelog
  disk-image-uefi.binary: enable secureboot on the arm64 image.

debian/changelog

@@ -1,3 +1,10 @@
+livecd-rootfs (2.664.42) UNRELEASED; urgency=medium
+
+  * ubuntu-cpc: Install `shim-signed` and `grub-efi-arm64-signed` to enable
+    secureboot on ARM64 images (LP:#1980358)
+
+ -- Ivan Kapelyukhin <ivan.kapelyukhin@canonical.com>  Thu, 30 Jun 2022 14:06:30 +0200
+
 livecd-rootfs (2.664.42) focal; urgency=medium
 
   * Switch intel-iot to use intel-iotg-edge, the 5.15 based IOTG kernel

live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary

@@ -117,7 +117,7 @@ install_grub() {
     # please file a bug against grub2 to include the affected module.
     case $ARCH in
         arm64)
-            chroot mountpoint apt-get -qqy install --no-install-recommends grub-efi-arm64 grub-efi-arm64-bin
+            chroot mountpoint apt-get -qqy install --no-install-recommends shim-signed grub-efi-arm64-signed
             efi_target=arm64-efi
             ;;
         armhf)