diff --git a/disk/grub2/DETAILS b/disk/grub2/DETAILS
index 13128f2..6635658 100755
--- a/disk/grub2/DETAILS
+++ b/disk/grub2/DETAILS
@@ -4,7 +4,7 @@
PATCHLEVEL=2
case "$GRUB2_RELEASE" in
(beta|stable|*)
- VERSION=2.06
+ VERSION=2.12
SOURCE=grub-$VERSION.tar.xz
SOURCE_URL[0]=${GNU_URL}/grub/$SOURCE
SOURCE2=grub-$VERSION.tar.xz.sig
diff --git a/disk/grub2/HISTORY b/disk/grub2/HISTORY
index f5bcbb0..eeb363d 100644
--- a/disk/grub2/HISTORY
+++ b/disk/grub2/HISTORY
@@ -1,3 +1,8 @@
+2025-02=07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.12
+ * grub2-ignore_ext4_checksum_seed_feature.patch: deleted
+ * PRE_BUILD: tweak
+
2023-08-24 Stephane Fontaine <esselfe16 AT gmail.com>
* DETAILS: PATCHLEVEL++
* PRE_BUILD: add a patch to fix installation errors with
diff --git a/disk/grub2/PRE_BUILD b/disk/grub2/PRE_BUILD
index b97e169..9696c57 100755
--- a/disk/grub2/PRE_BUILD
+++ b/disk/grub2/PRE_BUILD
@@ -1,7 +1,7 @@
default_pre_build &&
cd "${SOURCE_DIRECTORY}" &&
-
-patch -p1 <
"$SCRIPT_DIRECTORY/grub2-ignore_ext4_checksum_seed_feature.patch" &&
+# suggested by blfs
+echo depends bli part_gpt > grub-core/extra_deps.lst &&
if [[ "$GRUB2_RELEASE" != "stable" ]]; then
./autogen.sh
diff --git a/disk/grub2/grub2-ignore_ext4_checksum_seed_feature.patch
b/disk/grub2/grub2-ignore_ext4_checksum_seed_feature.patch
deleted file mode 100644
index ac88a43..0000000
--- a/disk/grub2/grub2-ignore_ext4_checksum_seed_feature.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Suggested-by: Eric Sandeen <esandeen AT redhat.com>
-Suggested-by: Lukas Czerner <lczerner AT redhat.com>
-Signed-off-by: Javier Martinez Canillas <javierm AT redhat.com>
-Regenerated-by: Stephane Fontaine <esselfe16 AT gmail.com>
----
-
-diff -ur grub-2.06-orig/grub-core/fs/ext2.c grub-2.06-new/grub-core/fs/ext2.c
---- grub-2.06-orig/grub-core/fs/ext2.c 2021-06-01 11:16:48.000000000 -0400
-+++ grub-2.06-new/grub-core/fs/ext2.c 2023-08-24 16:54:31.890991253 -0400
-@@ -103,6 +103,7 @@
- #define EXT4_FEATURE_INCOMPAT_64BIT 0x0080
- #define EXT4_FEATURE_INCOMPAT_MMP 0x0100
- #define EXT4_FEATURE_INCOMPAT_FLEX_BG 0x0200
-+#define EXT4_FEATURE_INCOMPAT_CSUM_SEED 0x2000
- #define EXT4_FEATURE_INCOMPAT_ENCRYPT 0x10000
-
- /* The set of back-incompatible features this driver DOES support. Add (OR)
-@@ -112,6 +113,7 @@
- | EXT4_FEATURE_INCOMPAT_FLEX_BG \
- | EXT2_FEATURE_INCOMPAT_META_BG \
- | EXT4_FEATURE_INCOMPAT_64BIT \
-+ | EXT4_FEATURE_INCOMPAT_CSUM_SEED \
- | EXT4_FEATURE_INCOMPAT_ENCRYPT)
- /* List of rationales for the ignored "incompatible" features:
- * needs_recovery: Not really back-incompatible - was added as such to
forbid
-@@ -123,6 +125,12 @@
- * mmp: Not really back-incompatible - was added as such to
- * avoid multiple read-write mounts. Safe to ignore for this
- * RO driver.
-+ * checksum seed: Not really back-incompatible - was added to allow tools
-+ * such as tune2fs to change the UUID on a mounted metadata
-+ * checksummed filesystem. Safe to ignore for now since the
-+ * driver doesn't support checksum verification. But it must
-+ * be removed from this list if that support is added later.
-+ *
- */
- #define EXT2_DRIVER_IGNORED_INCOMPAT ( EXT3_FEATURE_INCOMPAT_RECOVER \
- | EXT4_FEATURE_INCOMPAT_MMP)
[[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (c62b23585c01e999e3c1b9ae7f6aac034e66e7b5),
Treeve Jelbert, 02/07/2025