diff --git a/grub2/.signature b/grub2/.signature index 70381b2d1..cd80e3903 100644 --- a/grub2/.signature +++ b/grub2/.signature @@ -1,8 +1,9 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/Tugij7l2s9daXoMEGg5Cy3nycSfNulx6n7vTBGMe5cdCBG7Obw12n/Dfde5JQF/Zo34UffGVyH4qiOlEPjsvQ0= -SHA256 (Pkgfile) = fd3e73c60329c5501cf7591a586ab26200666864cb9a063b56e459170f7ffe56 +RWSE3ohX2g5d/cozKRKF34ScNUh5gcMmQLYXN+Yxhw5NwdwBJKbGRJNA4S5lrn+PfXqV9/3zIMwBONSVCWpgRQj7YnR4Wt8djgY= +SHA256 (Pkgfile) = be46c0b058e3d19f42d6417e2d9ab898e2d508ed8f58aa5b0166c1ca332faeab SHA256 (.footprint) = 3dcb92cc7537b4647fada7f2851b521bb7e6bffb6ddaa9110e6572f39dc22d34 SHA256 (grub-2.06.tar.xz) = b79ea44af91b93d17cd3fe80bdae6ed43770678a9a5ae192ccea803ebb657ee1 SHA256 (unifont-9.0.06.pcf.gz) = 6d23e82ea3fd3d79849d675c0c30129b62a3973a83b4cdc05f9994efef773b86 SHA256 (grub2-tweaks.diff) = 7b1b96a5d0d97bf671b34e3ab12e88a95ed343cbf7a548209b32bc86b4aeba39 SHA256 (grub.cfg.sample) = c2e72228c1dd150f727e8d611d6f14956080ce078651b03eb14fcf65b0917dda +SHA256 (csum_seed.diff) = ec7b142af05f0bdf3b923e0f3c365592760fc9c10896e9a23899f96e59ad5bfb diff --git a/grub2/Pkgfile b/grub2/Pkgfile index b227ee5e7..beb09e081 100644 --- a/grub2/Pkgfile +++ b/grub2/Pkgfile @@ -5,16 +5,17 @@ name=grub2 version=2.06 -release=3 +release=4 source=(http://ftp.gnu.org/gnu/grub/grub-$version.tar.xz \ http://jaeger.morpheus.net/linux/crux/files/unifont-9.0.06.pcf.gz \ - $name-tweaks.diff grub.cfg.sample) + $name-tweaks.diff grub.cfg.sample csum_seed.diff) build() { export CFLAGS="${CFLAGS} -Wno-error -Os" export PYTHON=python3 cd grub-$version patch -p1 -i $SRC/$name-tweaks.diff + patch -p1 -i $SRC/csum_seed.diff ./configure --prefix=/usr \ --sysconfdir=/etc \ diff --git a/grub2/csum_seed.diff b/grub2/csum_seed.diff new file mode 100644 index 000000000..0b33ec8d9 --- /dev/null +++ b/grub2/csum_seed.diff @@ -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