From: Steve McIntyre <93sam@debian.org>
Date: Thu, 20 Apr 2023 23:59:32 +0000 (+0100)
Subject: Fix 32-bit compilation
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=4f52e7f9b04a30bef2789a50d57b969a74f73267;p=grub2.git

Fix 32-bit compilation
---

diff --git a/debian/changelog b/debian/changelog
index 64d1bae50..b9050c177 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grub2 (2.06-10) unstable; urgency=medium
+
+  * Fix 32-bit build with the osdep/devmapper/getroot patches.
+
+ -- Steve McIntyre <93sam@debian.org>  Fri, 21 Apr 2023 01:14:13 +0100
+
 grub2 (2.06-9) unstable; urgency=medium
 
   [ Steve McIntyre ]
diff --git a/debian/patches/osdep-devmapper-getroot-set-up-cheated-luks2-cryptodisk-mount-from-dm-parameters.patch b/debian/patches/osdep-devmapper-getroot-set-up-cheated-luks2-cryptodisk-mount-from-dm-parameters.patch
index 1f53481fa..fd35f9a0e 100644
--- a/debian/patches/osdep-devmapper-getroot-set-up-cheated-luks2-cryptodisk-mount-from-dm-parameters.patch
+++ b/debian/patches/osdep-devmapper-getroot-set-up-cheated-luks2-cryptodisk-mount-from-dm-parameters.patch
@@ -108,7 +108,7 @@ index 2bf4264..cc3f7da 100644
 +                                 params);
 +              cipher = grub_strndup (c, seek_head - c);
 +              if (cipher == NULL)
-+                grub_util_error (_("could not strndup cipher of length `%lu'"), seek_head - c);
++                grub_util_error (_("could not strndup cipher of length `%u'"), seek_head - c);
 +              remaining -= seek_head - c + 1;
 +              c = seek_head + 1;
 +
@@ -119,7 +119,7 @@ index 2bf4264..cc3f7da 100644
 +                                 params);
 +              cipher_mode = grub_strndup (c, seek_head - c);
 +              if (cipher_mode == NULL)
-+                grub_util_error (_("could not strndup cipher_mode of length `%lu'"), seek_head - c);
++                grub_util_error (_("could not strndup cipher_mode of length `%u'"), seek_head - c);
 +
 +              remaining -= seek_head - c + 1;
 +              c = seek_head + 1;