grub2-efi: added checksum seed patch for updated e2fsprogs default behavior

This commit is contained in:
Matt Housh 2023-07-06 19:47:17 -05:00
parent 1cf2b79255
commit f4126f6e1a
3 changed files with 36 additions and 4 deletions

View File

@ -1,5 +1,6 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/RtV38XisII8Fv+ROD8RQH/GKcLTEUlWIatBxO61JQjmM2Gw0fP/3D4gnPlzZFYYsa6tp2pZVdUfvc5cJK0r6g0=
SHA256 (Pkgfile) = 931e1e692898c69e5d067cc167ecc4435f085bd54d9e275c44c3278ce4f313d2
RWSE3ohX2g5d/TNVqY0BBoLUuSbASzkRDGDaGPzj5FepEZpRwwxhiU/Hg448+FwPVzJvf+vp5Pi43sdIuMQxZdSoxpffgV0fTgM=
SHA256 (Pkgfile) = 9bbb2bf90bd0e08ed8e9331a09362fe6e488f121c7ab7243c545e5ee54dbac45
SHA256 (.footprint) = 4212f468bbe1de31e9f8e0452a487d2f3e391ad4497edc3cc8a8fcec3aa27135
SHA256 (grub-2.06.tar.xz) = b79ea44af91b93d17cd3fe80bdae6ed43770678a9a5ae192ccea803ebb657ee1
SHA256 (csum_seed.diff) = ec7b142af05f0bdf3b923e0f3c365592760fc9c10896e9a23899f96e59ad5bfb

View File

@ -5,8 +5,8 @@
name=grub2-efi
version=2.06
release=1
source=(http://ftp.gnu.org/gnu/grub/grub-$version.tar.xz)
release=2
source=(http://ftp.gnu.org/gnu/grub/grub-$version.tar.xz csum_seed.diff)
build() {
export CFLAGS="${CFLAGS} -Wno-error"
@ -14,6 +14,8 @@ build() {
MODLIST="boot chain configfile fat ext2 linux normal ntfs part_gpt part_msdos"
patch -d grub-$version -p1 -i $SRC/csum_seed.diff
for ARCH in i386 x86_64
do
mkdir $ARCH

29
grub2-efi/csum_seed.diff Normal file
View File

@ -0,0 +1,29 @@
diff --git a/grub-core/fs/ext2.c b/grub-core/fs/ext2.c
index e7dd78e..4953a15 100644
--- a/grub-core/fs/ext2.c
+++ b/grub-core/fs/ext2.c
@@ -103,6 +103,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
#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)
@@ -123,10 +124,15 @@ GRUB_MOD_LICENSE ("GPLv3+");
* 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. However, it
+ * has to be removed from this list if the support is added later.
*/
#define EXT2_DRIVER_IGNORED_INCOMPAT ( EXT3_FEATURE_INCOMPAT_RECOVER \
- | EXT4_FEATURE_INCOMPAT_MMP)
-
+ | EXT4_FEATURE_INCOMPAT_MMP \
+ | EXT4_FEATURE_INCOMPAT_CSUM_SEED)
#define EXT3_JOURNAL_MAGIC_NUMBER 0xc03b3998U