diff options
| -rw-r--r-- | metadata/md5-cache/sys-boot/grub-2.04-r13 (renamed from metadata/md5-cache/sys-boot/grub-2.04-r12) | 4 | ||||
| -rw-r--r-- | metadata/pkg_desc_index | 2 | ||||
| -rw-r--r-- | sys-boot/grub/files/00-build-Fix-GRUB-i386-pc-build-with-Ubuntu-gcc.patch (renamed from sys-boot/grub/files/0001-build-Fix-GRUB-i386-pc-build-with-Ubuntu-gcc.patch) | 0 | ||||
| -rw-r--r-- | sys-boot/grub/files/05-fs-ext2-ignore-checksum-seed.patch | 62 | ||||
| -rw-r--r-- | sys-boot/grub/grub-2.04-r13.ebuild (renamed from sys-boot/grub/grub-2.04-r12.ebuild) | 3 |
5 files changed, 67 insertions, 4 deletions
diff --git a/metadata/md5-cache/sys-boot/grub-2.04-r12 b/metadata/md5-cache/sys-boot/grub-2.04-r13 index da1a0e7f..942db729 100644 --- a/metadata/md5-cache/sys-boot/grub-2.04-r12 +++ b/metadata/md5-cache/sys-boot/grub-2.04-r13 @@ -11,7 +11,7 @@ LICENSE=GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera ) RDEPEND=app-arch/xz-utils >=sys-libs/ncurses-5.2-r5:0= sdl? ( media-libs/libsdl ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) mount? ( sys-fs/fuse:0 ) truetype? ( media-libs/freetype:2= ) ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) grub_platforms_xen? ( app-emulation/xen-tools:= ) grub_platforms_xen-32? ( app-emulation/xen-tools:= ) grub_platforms_xen-pvh? ( app-emulation/xen-tools:= ) kernel_linux? ( grub_platforms_efi-32? ( sys-boot/efibootmgr ) grub_platforms_efi-64? ( sys-boot/efibootmgr ) ) !sys-boot/grub:0 !sys-boot/grub-static nls? ( sys-devel/gettext ) REQUIRED_USE=grub_platforms_coreboot? ( fonts ) grub_platforms_qemu? ( fonts ) grub_platforms_ieee1275? ( fonts ) grub_platforms_loongson? ( fonts ) RESTRICT=!test? ( test ) -SLOT=2/2.04-r12 +SLOT=2/2.04-r13 SRC_URI=mirror://gnu/grub/grub-2.04.tar.xz fonts? ( mirror://gnu/unifont/unifont-12.1.02/unifont-12.1.02.pcf.gz ) themes? ( mirror://sourceforge/dejavu/dejavu-sans-ttf-2.37.zip ) _eclasses_=autotools 6dcd6b6a486e79928e1243ff9ba41fcc bash-completion-r1 f5e7a020fd9c741740756aac61bf75ff edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 8f942ebdcf04334697649d4a0bf65a32 flag-o-matic 69394e25812406faa1f90edaf4969395 gnuconfig b6b3e92f8b8c996400074b5f61a59256 libtool 241a8f577b9781a42a7421e53448a44e multibuild bddcb51b74f4a76724ff7cf8e7388869 multilib 5ca4e49abed8e3a2f7b56920eadee157 out-of-source-utils 1a9007554652a6e627edbccb3c25a439 pax-utils 91d47e5d20627c717aa878b9167c62a8 strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs 6001248ef162a5fa2a21ce132a212f6b wrapper 4a1902f969e5718126434fc35f3a0d9c -_md5_=e09dbc3a4ff424c670f6d77cb2b8602e +_md5_=c9c8b19bbae10a9e4248409d87d3a15d diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index index 17946c84..443c2077 100644 --- a/metadata/pkg_desc_index +++ b/metadata/pkg_desc_index @@ -45,7 +45,7 @@ sys-auth/elogind 246.10-r3: The systemd project's logind, extracted to a standal sys-auth/polkit-qt 0.113.0-r11: PolicyKit Qt API wrapper library (meta package) sys-auth/polkit-qt5 0.113.0-r5: Qt wrapper around polkit-1 client libraries sys-boot/etcher 1.5.116: Flash OS images to SD cards & USB drives, safely and easily. -sys-boot/grub 2.04-r12: GNU GRUB boot loader +sys-boot/grub 2.04-r13: GNU GRUB boot loader sys-boot/os-prober 1.77-r10: Utility to detect other OSs on a set of drives sys-boot/plymouth 0.9.4-r11: Graphical boot animation (splash) and logger sys-boot/unetbootin-static 625-r3: Universal Netboot Installer creates Live USB systems for various OS distributions diff --git a/sys-boot/grub/files/0001-build-Fix-GRUB-i386-pc-build-with-Ubuntu-gcc.patch b/sys-boot/grub/files/00-build-Fix-GRUB-i386-pc-build-with-Ubuntu-gcc.patch index 357c825f..357c825f 100644 --- a/sys-boot/grub/files/0001-build-Fix-GRUB-i386-pc-build-with-Ubuntu-gcc.patch +++ b/sys-boot/grub/files/00-build-Fix-GRUB-i386-pc-build-with-Ubuntu-gcc.patch diff --git a/sys-boot/grub/files/05-fs-ext2-ignore-checksum-seed.patch b/sys-boot/grub/files/05-fs-ext2-ignore-checksum-seed.patch new file mode 100644 index 00000000..9024b479 --- /dev/null +++ b/sys-boot/grub/files/05-fs-ext2-ignore-checksum-seed.patch @@ -0,0 +1,62 @@ +https://bugs.gentoo.org/894200 +https://git.savannah.gnu.org/cgit/grub.git/patch/?id=7fd5feff97c4b1f446f8fcf6d37aca0c64e7c763 + +From 7fd5feff97c4b1f446f8fcf6d37aca0c64e7c763 Mon Sep 17 00:00:00 2001 +From: Javier Martinez Canillas <javierm@redhat.com> +Date: Fri, 11 Jun 2021 21:36:16 +0200 +Subject: fs/ext2: Ignore checksum seed incompat feature + +This incompat feature is used to denote that the filesystem stored its +metadata checksum seed in the superblock. This is used to allow tune2fs +changing the UUID on a mounted metdata_csum filesystem without having +to rewrite all the disk metadata. However, the GRUB doesn't use the +metadata checksum at all. So, it can just ignore this feature if it +is enabled. This is consistent with the GRUB filesystem code in general +which just does a best effort to access the filesystem's data. + +The checksum seed incompat feature has to be removed from the ignore +list if the support for metadata checksum verification is added to the +GRUB ext2 driver later. + +Suggested-by: Eric Sandeen <esandeen@redhat.com> +Suggested-by: Lukas Czerner <lczerner@redhat.com> +Signed-off-by: Javier Martinez Canillas <javierm@redhat.com> +Reviewed-by: Lukas Czerner <lczerner@redhat.com> +Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> +--- + grub-core/fs/ext2.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +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 + +-- +cgit v1.1 + diff --git a/sys-boot/grub/grub-2.04-r12.ebuild b/sys-boot/grub/grub-2.04-r13.ebuild index 286d5017..10dfddc7 100644 --- a/sys-boot/grub/grub-2.04-r12.ebuild +++ b/sys-boot/grub/grub-2.04-r13.ebuild @@ -38,11 +38,12 @@ else fi PATCHES=( - "${FILESDIR}"/0001-build-Fix-GRUB-i386-pc-build-with-Ubuntu-gcc.patch + "${FILESDIR}"/00-build-Fix-GRUB-i386-pc-build-with-Ubuntu-gcc.patch "${FILESDIR}"/01-gfxpayload.patch "${FILESDIR}"/02-KERNEL_GLOBS.patch "${FILESDIR}"/03-sparc64-bios-boot.patch "${FILESDIR}"/04-fgrep.patch + "${FILESDIR}"/05-fs-ext2-ignore-checksum-seed.patch ) DEJAVU=dejavu-sans-ttf-2.37 |