Fix up arm64 SB patch to fix build failure on 32-bit systems

diff --git a/debian/changelog b/debian/changelog
index e470dcfde93b15a80ad2b21bc46304ca542183a5..a28558749cecfe24b703c81b73ca39153a37eb44 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grub2 (2.06-12) unstable; urgency=medium
+
+  * Fix up arm64 SB patch to fix build failure on 32-bit arm systems
+
+ -- Steve McIntyre <93sam@debian.org>  Fri, 21 Apr 2023 13:30:26 +0100
+
 grub2 (2.06-11) unstable; urgency=medium
 
   * And try again... :-/

diff --git a/debian/patches/arm64-handover-to-kernel-if-sb-enabled.patch b/debian/patches/arm64-handover-to-kernel-if-sb-enabled.patch
index 6a57dad43261687bbc77ffe6c8878616fd37d9e1..e20d4ad150ac4ccdc86831b0827ffdf4bd9a95cb 100644 (file)
--- a/debian/patches/arm64-handover-to-kernel-if-sb-enabled.patch
+++ b/debian/patches/arm64-handover-to-kernel-if-sb-enabled.patch
@@ -10,10 +10,10 @@ Signed-off-by: Emanuele Rocca <ema@debian.org>
 Origin: vendor, https://github.com/rhboot/grub2/commit/2786ab864cf00c15123320671f653e9a36ba12b4
 ---
 
-Index: grub2-2.06/grub-core/loader/arm64/linux.c
+Index: grub.git/grub-core/loader/arm64/linux.c
 ===================================================================
---- grub2-2.06.orig/grub-core/loader/arm64/linux.c
-+++ grub2-2.06/grub-core/loader/arm64/linux.c
+--- grub.git.orig/grub-core/loader/arm64/linux.c
++++ grub.git/grub-core/loader/arm64/linux.c
 @@ -16,6 +16,7 @@
   *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
   */
@@ -92,13 +92,13 @@ Index: grub2-2.06/grub-core/loader/arm64/linux.c
    return GRUB_ERR_NONE;
  
  failure:
-@@ -114,8 +148,38 @@ grub_arch_efi_linux_boot_image (grub_add
-   grub_efi_boot_services_t *b;
-   grub_efi_status_t status;
+@@ -116,6 +150,39 @@ grub_arch_efi_linux_boot_image (grub_add
    grub_efi_loaded_image_t *loaded_image;
-+  handover_func hf;
    int len;
  
++#ifdef __aarch64__  /* SB only enabled for arm64 */
++  handover_func hf;
++
 +  if (grub_efi_get_secureboot() == GRUB_EFI_SECUREBOOT_MODE_ENABLED) {
 +      grub_dprintf ("linux", "GRUB_EFI_SECUREBOOT_MODE enabled\n");
 +      /*
@@ -127,11 +127,12 @@ Index: grub2-2.06/grub-core/loader/arm64/linux.c
 +  }
 +
 +  grub_dprintf ("linux", "GRUB_EFI_SECUREBOOT_MODE is NOT enabled\n");
++#endif
 +
    mempath = grub_malloc (2 * sizeof (grub_efi_memory_mapped_device_path_t));
    if (!mempath)
      return grub_errno;
-@@ -285,6 +349,7 @@ grub_cmd_linux (grub_command_t cmd __att
+@@ -285,6 +352,7 @@ grub_cmd_linux (grub_command_t cmd __att
  {
    grub_file_t file = 0;
    struct linux_arch_kernel_header lh;
@@ -139,7 +140,7 @@ Index: grub2-2.06/grub-core/loader/arm64/linux.c
    grub_err_t err;
  
    grub_dl_ref (my_mod);
-@@ -330,6 +395,9 @@ grub_cmd_linux (grub_command_t cmd __att
+@@ -330,6 +398,9 @@ grub_cmd_linux (grub_command_t cmd __att
  
    grub_dprintf ("linux", "kernel @ %p\n", kernel_addr);