* Re: e2fsprogs: update to 1.47.0, add fuse-devel to makedepends, split fus…
2023-02-08 22:28 [PR PATCH] e2fsprogs: update to 1.47.0, add fuse-devel to makedepends, split fus… dkwo
@ 2023-03-02 22:39 ` JamiKettunen
2023-03-25 9:18 ` paper42
` (14 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: JamiKettunen @ 2023-03-02 22:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 383 bytes --]
New comment by JamiKettunen on void-packages repository
https://github.com/void-linux/void-packages/pull/42160#issuecomment-1452659126
Comment:
Certainly helped me with fixing this ;)
```
e2fsck 1.46.5 (30-Dec-2021)
<DEV> has unsupported feature(s): FEATURE_C12
e2fsck: Get a newer version of e2fsck!
<LABEL>: ********** WARNING: Filesystem still has errors **********
```
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: e2fsprogs: update to 1.47.0, add fuse-devel to makedepends, split fus…
2023-02-08 22:28 [PR PATCH] e2fsprogs: update to 1.47.0, add fuse-devel to makedepends, split fus… dkwo
2023-03-02 22:39 ` JamiKettunen
@ 2023-03-25 9:18 ` paper42
2023-03-25 14:13 ` dkwo
` (13 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: paper42 @ 2023-03-25 9:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 278 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/42160#issuecomment-1483773661
Comment:
This will break grub-install because it adds a new default option metadata_csum_seed to mkfs.ext4 which doesn't work with current grub.
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: e2fsprogs: update to 1.47.0, add fuse-devel to makedepends, split fus…
2023-02-08 22:28 [PR PATCH] e2fsprogs: update to 1.47.0, add fuse-devel to makedepends, split fus… dkwo
2023-03-02 22:39 ` JamiKettunen
2023-03-25 9:18 ` paper42
@ 2023-03-25 14:13 ` dkwo
2023-03-25 15:45 ` dkwo
` (12 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: dkwo @ 2023-03-25 14:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 179 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/42160#issuecomment-1483834829
Comment:
Should I patch grub as e.g. Debian does?
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: e2fsprogs: update to 1.47.0, add fuse-devel to makedepends, split fus…
2023-02-08 22:28 [PR PATCH] e2fsprogs: update to 1.47.0, add fuse-devel to makedepends, split fus… dkwo
` (2 preceding siblings ...)
2023-03-25 14:13 ` dkwo
@ 2023-03-25 15:45 ` dkwo
2023-03-25 16:13 ` paper42
` (11 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: dkwo @ 2023-03-25 15:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 332 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/42160#issuecomment-1483854468
Comment:
perhaps add to grub these two patches from Alpine https://git.alpinelinux.org/aports/tree/main/grub/xx-e2fsprogs-1.patch https://git.alpinelinux.org/aports/tree/main/grub/xx-e2fsprogs-2.patch ?
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: e2fsprogs: update to 1.47.0, add fuse-devel to makedepends, split fus…
2023-02-08 22:28 [PR PATCH] e2fsprogs: update to 1.47.0, add fuse-devel to makedepends, split fus… dkwo
` (3 preceding siblings ...)
2023-03-25 15:45 ` dkwo
@ 2023-03-25 16:13 ` paper42
2023-03-25 19:26 ` [PR PATCH] [Updated] " dkwo
` (10 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: paper42 @ 2023-03-25 16:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 156 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/42160#issuecomment-1483860427
Comment:
yes, please do
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PR PATCH] [Updated] e2fsprogs: update to 1.47.0, add fuse-devel to makedepends, split fus…
2023-02-08 22:28 [PR PATCH] e2fsprogs: update to 1.47.0, add fuse-devel to makedepends, split fus… dkwo
` (4 preceding siblings ...)
2023-03-25 16:13 ` paper42
@ 2023-03-25 19:26 ` dkwo
2023-03-25 19:29 ` dkwo
` (9 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: dkwo @ 2023-03-25 19:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 562 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages e2fs
https://github.com/void-linux/void-packages/pull/42160
e2fsprogs: update to 1.47.0, add fuse-devel to makedepends, split fus…
…e2fs subpkg
- I tested the changes in this PR: no
- I built this PR locally for my native architecture, (x86_64-musl)
fixes https://github.com/void-linux/void-packages/issues/42150 @Gottox @danjenson
A patch file from https://github.com/void-linux/void-packages/pull/42160.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-e2fs-42160.patch --]
[-- Type: text/x-diff, Size: 9229 bytes --]
From e2ba7440b09a0f3e4dbc831233f3b063084e4405 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 8 Feb 2023 17:20:46 -0500
Subject: [PATCH 1/2] e2fsprogs: update to 1.47.0, add fuse-devel to
makedepends, split fuse2fs subpkg
---
srcpkgs/e2fsprogs/template | 15 ++++++++++++---
srcpkgs/fuse2fs | 1 +
2 files changed, 13 insertions(+), 3 deletions(-)
create mode 120000 srcpkgs/fuse2fs
diff --git a/srcpkgs/e2fsprogs/template b/srcpkgs/e2fsprogs/template
index a32c50b823b5..7b41eb0ac1d7 100644
--- a/srcpkgs/e2fsprogs/template
+++ b/srcpkgs/e2fsprogs/template
@@ -1,6 +1,6 @@
# Template file for 'e2fsprogs'
pkgname=e2fsprogs
-version=1.46.5
+version=1.47.0
revision=1
build_style=gnu-configure
configure_args="--enable-elf-shlibs --disable-fsck
@@ -10,14 +10,14 @@ configure_args="--enable-elf-shlibs --disable-fsck
--sbindir=/usr/bin --libdir=/usr/lib e2fsprogs_cv_struct_st_flags=no"
make_install_args="install-libs"
hostmakedepends="texinfo pkg-config"
-makedepends="libuuid-devel libblkid-devel"
+makedepends="libuuid-devel libblkid-devel fuse-devel"
checkdepends="perl tar"
short_desc="Ext2/3/4 Filesystem Utilities"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="http://e2fsprogs.sourceforge.net/"
distfiles="${KERNEL_SITE}/kernel/people/tytso/e2fsprogs/v${version}/e2fsprogs-${version}.tar.xz"
-checksum=2f16c9176704cf645dc69d5b15ff704ae722d665df38b2ed3cfc249757d8d81e
+checksum=144af53f2bbd921cef6f8bea88bb9faddca865da3fbc657cc9b4d2001097d5db
conf_files="/etc/mke2fs.conf /etc/e2scrub.conf"
do_check() {
@@ -55,9 +55,18 @@ e2fsprogs-devel_package() {
vmove "usr/share/info/libext2fs.info*"
}
}
+
e2fsprogs-libs_package() {
short_desc+=" - shared libraries"
pkg_install() {
vmove "usr/lib/*.so.*"
}
}
+
+fuse2fs_package() {
+ short_desc+=" - driver for FUSE"
+ pkg_install() {
+ vmove usr/bin/fuse2fs
+ vmove usr/share/man/man1/fuse2fs.1
+ }
+}
diff --git a/srcpkgs/fuse2fs b/srcpkgs/fuse2fs
new file mode 120000
index 000000000000..84c526343bfc
--- /dev/null
+++ b/srcpkgs/fuse2fs
@@ -0,0 +1 @@
+e2fsprogs
\ No newline at end of file
From 9bee5053ad20c3aae5814c21b4fb087f71576ef3 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sat, 25 Mar 2023 15:26:13 -0400
Subject: [PATCH 2/2] grub: patch for e2fsprogs
---
srcpkgs/grub/patches/xx-e2fsprogs-1.patch | 62 +++++++++++++++++++++++
srcpkgs/grub/patches/xx-e2fsprogs-2.patch | 60 ++++++++++++++++++++++
srcpkgs/grub/template | 2 +-
3 files changed, 123 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/grub/patches/xx-e2fsprogs-1.patch
create mode 100644 srcpkgs/grub/patches/xx-e2fsprogs-2.patch
diff --git a/srcpkgs/grub/patches/xx-e2fsprogs-1.patch b/srcpkgs/grub/patches/xx-e2fsprogs-1.patch
new file mode 100644
index 000000000000..5cd83273be1a
--- /dev/null
+++ b/srcpkgs/grub/patches/xx-e2fsprogs-1.patch
@@ -0,0 +1,62 @@
+Patch-Source: https://git.savannah.gnu.org/cgit/grub.git/commit/?id=7fd5feff97c4b1f446f8fcf6d37aca0c64e7c763
+useful because e2fsprogs 1.47 defaults to this enabled, and grub won't touch it
+--
+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/srcpkgs/grub/patches/xx-e2fsprogs-2.patch b/srcpkgs/grub/patches/xx-e2fsprogs-2.patch
new file mode 100644
index 000000000000..7e02e2087799
--- /dev/null
+++ b/srcpkgs/grub/patches/xx-e2fsprogs-2.patch
@@ -0,0 +1,60 @@
+Patch-Source: https://git.savannah.gnu.org/cgit/grub.git/patch/?id=2e9fa73a040462b81bfbfe56c0bc7ad2d30b446b
+useful to support the large_dir ext4 feature
+--
+From 2e9fa73a040462b81bfbfe56c0bc7ad2d30b446b Mon Sep 17 00:00:00 2001
+From: Theodore Ts'o <tytso@mit.edu>
+Date: Tue, 30 Aug 2022 22:41:59 -0400
+Subject: fs/ext2: Ignore the large_dir incompat feature
+
+Recently, ext4 added the large_dir feature, which adds support for
+a 3 level htree directory support.
+
+The GRUB supports existing file systems with htree directories by
+ignoring their existence, and since the index nodes for the hash tree
+look like deleted directory entries (by design), the GRUB can simply do
+a brute force O(n) linear search of directories. The same is true for
+3 level deep htrees indicated by large_dir feature flag.
+
+Hence, it is safe for the GRUB to ignore the large_dir incompat feature.
+
+Fixes: https://savannah.gnu.org/bugs/?61606
+
+Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/fs/ext2.c | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/grub-core/fs/ext2.c b/grub-core/fs/ext2.c
+index 0989e26..e1cc5e6 100644
+--- a/grub-core/fs/ext2.c
++++ b/grub-core/fs/ext2.c
+@@ -104,6 +104,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
+ #define EXT4_FEATURE_INCOMPAT_MMP 0x0100
+ #define EXT4_FEATURE_INCOMPAT_FLEX_BG 0x0200
+ #define EXT4_FEATURE_INCOMPAT_CSUM_SEED 0x2000
++#define EXT4_FEATURE_INCOMPAT_LARGEDIR 0x4000 /* >2GB or 3 level htree */
+ #define EXT4_FEATURE_INCOMPAT_ENCRYPT 0x10000
+
+ /* The set of back-incompatible features this driver DOES support. Add (OR)
+@@ -129,10 +130,17 @@ GRUB_MOD_LICENSE ("GPLv3+");
+ * 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.
++ * large_dir: Not back-incompatible given that the GRUB ext2 driver does
++ * not implement EXT2_FEATURE_COMPAT_DIR_INDEX. If the GRUB
++ * eventually supports the htree feature (aka dir_index)
++ * it should support 3 level htrees and then move
++ * EXT4_FEATURE_INCOMPAT_LARGEDIR to
++ * EXT2_DRIVER_SUPPORTED_INCOMPAT.
+ */
+ #define EXT2_DRIVER_IGNORED_INCOMPAT ( EXT3_FEATURE_INCOMPAT_RECOVER \
+ | EXT4_FEATURE_INCOMPAT_MMP \
+- | EXT4_FEATURE_INCOMPAT_CSUM_SEED)
++ | EXT4_FEATURE_INCOMPAT_CSUM_SEED \
++ | EXT4_FEATURE_INCOMPAT_LARGEDIR)
+
+ #define EXT3_JOURNAL_MAGIC_NUMBER 0xc03b3998U
+
+--
+cgit v1.1
diff --git a/srcpkgs/grub/template b/srcpkgs/grub/template
index b4d3b07af620..7294fa503f3a 100644
--- a/srcpkgs/grub/template
+++ b/srcpkgs/grub/template
@@ -1,7 +1,7 @@
# Template file for 'grub'
pkgname=grub
version=2.06
-revision=2
+revision=3
hostmakedepends="python3 pkg-config flex freetype-devel font-unifont-bdf help2man
automake gettext-devel-tools"
makedepends="libusb-compat-devel ncurses-devel freetype-devel
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: e2fsprogs: update to 1.47.0, add fuse-devel to makedepends, split fus…
2023-02-08 22:28 [PR PATCH] e2fsprogs: update to 1.47.0, add fuse-devel to makedepends, split fus… dkwo
` (5 preceding siblings ...)
2023-03-25 19:26 ` [PR PATCH] [Updated] " dkwo
@ 2023-03-25 19:29 ` dkwo
2023-05-10 12:37 ` JamiKettunen
` (8 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: dkwo @ 2023-03-25 19:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 186 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/42160#issuecomment-1483903761
Comment:
done. i don't use grub, so someone should test.
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: e2fsprogs: update to 1.47.0, add fuse-devel to makedepends, split fus…
2023-02-08 22:28 [PR PATCH] e2fsprogs: update to 1.47.0, add fuse-devel to makedepends, split fus… dkwo
` (6 preceding siblings ...)
2023-03-25 19:29 ` dkwo
@ 2023-05-10 12:37 ` JamiKettunen
2023-05-12 14:26 ` piso77
` (7 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: JamiKettunen @ 2023-05-10 12:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 508 bytes --]
New comment by JamiKettunen on void-packages repository
https://github.com/void-linux/void-packages/pull/42160#issuecomment-1542137342
Comment:
Any testers to get this going forward? I'm using F2FS so I can't test the GRUB thing (except maybe in a VM but then anyone else could do it too), otherwise I've required this to properly work with [`pmbootstrap`](https://git.sr.ht/~postmarketos/pmbootstrap) ext4 rootfs image generation for a while now and haven't noticed anything out of the ordinary otherwise
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: e2fsprogs: update to 1.47.0, add fuse-devel to makedepends, split fus…
2023-02-08 22:28 [PR PATCH] e2fsprogs: update to 1.47.0, add fuse-devel to makedepends, split fus… dkwo
` (7 preceding siblings ...)
2023-05-10 12:37 ` JamiKettunen
@ 2023-05-12 14:26 ` piso77
2023-05-12 19:50 ` dkwo
` (6 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: piso77 @ 2023-05-12 14:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 472 bytes --]
New comment by piso77 on void-packages repository
https://github.com/void-linux/void-packages/pull/42160#issuecomment-1545832163
Comment:
$ xbps-query -s grub
[*] grub-2.06_2 GRand Unified Bootloader 2
[*] grub-i386-efi-2.06_2 GRand Unified Bootloader 2 - i386 EFI support
[*] grub-x86_64-efi-2.06_2 GRand Unified Bootloader 2 - x86_64 EFI support
Is this the grub version to test?
Other than building 2fsprogs and installing it, what should i test?
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: e2fsprogs: update to 1.47.0, add fuse-devel to makedepends, split fus…
2023-02-08 22:28 [PR PATCH] e2fsprogs: update to 1.47.0, add fuse-devel to makedepends, split fus… dkwo
` (8 preceding siblings ...)
2023-05-12 14:26 ` piso77
@ 2023-05-12 19:50 ` dkwo
2023-05-12 22:02 ` dkwo
` (5 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: dkwo @ 2023-05-12 19:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 222 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/42160#issuecomment-1546213494
Comment:
@piso77 you should test this pr, both grub and e2fsprogs, not the ones in the repo.
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: e2fsprogs: update to 1.47.0, add fuse-devel to makedepends, split fus…
2023-02-08 22:28 [PR PATCH] e2fsprogs: update to 1.47.0, add fuse-devel to makedepends, split fus… dkwo
` (9 preceding siblings ...)
2023-05-12 19:50 ` dkwo
@ 2023-05-12 22:02 ` dkwo
2023-05-16 20:19 ` [PR PATCH] [Updated] " dkwo
` (4 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: dkwo @ 2023-05-12 22:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 238 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/42160#issuecomment-1546358378
Comment:
i guess a proper test would be e.g. create a new boot partition with this and check that grub works
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PR PATCH] [Updated] e2fsprogs: update to 1.47.0, add fuse-devel to makedepends, split fus…
2023-02-08 22:28 [PR PATCH] e2fsprogs: update to 1.47.0, add fuse-devel to makedepends, split fus… dkwo
` (10 preceding siblings ...)
2023-05-12 22:02 ` dkwo
@ 2023-05-16 20:19 ` dkwo
2023-05-18 15:43 ` piso77
` (3 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: dkwo @ 2023-05-16 20:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 562 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages e2fs
https://github.com/void-linux/void-packages/pull/42160
e2fsprogs: update to 1.47.0, add fuse-devel to makedepends, split fus…
…e2fs subpkg
- I tested the changes in this PR: no
- I built this PR locally for my native architecture, (x86_64-musl)
fixes https://github.com/void-linux/void-packages/issues/42150 @Gottox @danjenson
A patch file from https://github.com/void-linux/void-packages/pull/42160.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-e2fs-42160.patch --]
[-- Type: text/x-diff, Size: 9229 bytes --]
From 2478716a6bdf383949552c32f09413570316d44c Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 8 Feb 2023 17:20:46 -0500
Subject: [PATCH 1/2] e2fsprogs: update to 1.47.0, add fuse-devel to
makedepends, split fuse2fs subpkg
---
srcpkgs/e2fsprogs/template | 15 ++++++++++++---
srcpkgs/fuse2fs | 1 +
2 files changed, 13 insertions(+), 3 deletions(-)
create mode 120000 srcpkgs/fuse2fs
diff --git a/srcpkgs/e2fsprogs/template b/srcpkgs/e2fsprogs/template
index a32c50b823b5..7b41eb0ac1d7 100644
--- a/srcpkgs/e2fsprogs/template
+++ b/srcpkgs/e2fsprogs/template
@@ -1,6 +1,6 @@
# Template file for 'e2fsprogs'
pkgname=e2fsprogs
-version=1.46.5
+version=1.47.0
revision=1
build_style=gnu-configure
configure_args="--enable-elf-shlibs --disable-fsck
@@ -10,14 +10,14 @@ configure_args="--enable-elf-shlibs --disable-fsck
--sbindir=/usr/bin --libdir=/usr/lib e2fsprogs_cv_struct_st_flags=no"
make_install_args="install-libs"
hostmakedepends="texinfo pkg-config"
-makedepends="libuuid-devel libblkid-devel"
+makedepends="libuuid-devel libblkid-devel fuse-devel"
checkdepends="perl tar"
short_desc="Ext2/3/4 Filesystem Utilities"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="http://e2fsprogs.sourceforge.net/"
distfiles="${KERNEL_SITE}/kernel/people/tytso/e2fsprogs/v${version}/e2fsprogs-${version}.tar.xz"
-checksum=2f16c9176704cf645dc69d5b15ff704ae722d665df38b2ed3cfc249757d8d81e
+checksum=144af53f2bbd921cef6f8bea88bb9faddca865da3fbc657cc9b4d2001097d5db
conf_files="/etc/mke2fs.conf /etc/e2scrub.conf"
do_check() {
@@ -55,9 +55,18 @@ e2fsprogs-devel_package() {
vmove "usr/share/info/libext2fs.info*"
}
}
+
e2fsprogs-libs_package() {
short_desc+=" - shared libraries"
pkg_install() {
vmove "usr/lib/*.so.*"
}
}
+
+fuse2fs_package() {
+ short_desc+=" - driver for FUSE"
+ pkg_install() {
+ vmove usr/bin/fuse2fs
+ vmove usr/share/man/man1/fuse2fs.1
+ }
+}
diff --git a/srcpkgs/fuse2fs b/srcpkgs/fuse2fs
new file mode 120000
index 000000000000..84c526343bfc
--- /dev/null
+++ b/srcpkgs/fuse2fs
@@ -0,0 +1 @@
+e2fsprogs
\ No newline at end of file
From a6474c0bf6a930e1011749d1f87b01f46a44e723 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sat, 25 Mar 2023 15:26:13 -0400
Subject: [PATCH 2/2] grub: patch for e2fsprogs
---
srcpkgs/grub/patches/xx-e2fsprogs-1.patch | 62 +++++++++++++++++++++++
srcpkgs/grub/patches/xx-e2fsprogs-2.patch | 60 ++++++++++++++++++++++
srcpkgs/grub/template | 2 +-
3 files changed, 123 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/grub/patches/xx-e2fsprogs-1.patch
create mode 100644 srcpkgs/grub/patches/xx-e2fsprogs-2.patch
diff --git a/srcpkgs/grub/patches/xx-e2fsprogs-1.patch b/srcpkgs/grub/patches/xx-e2fsprogs-1.patch
new file mode 100644
index 000000000000..5cd83273be1a
--- /dev/null
+++ b/srcpkgs/grub/patches/xx-e2fsprogs-1.patch
@@ -0,0 +1,62 @@
+Patch-Source: https://git.savannah.gnu.org/cgit/grub.git/commit/?id=7fd5feff97c4b1f446f8fcf6d37aca0c64e7c763
+useful because e2fsprogs 1.47 defaults to this enabled, and grub won't touch it
+--
+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/srcpkgs/grub/patches/xx-e2fsprogs-2.patch b/srcpkgs/grub/patches/xx-e2fsprogs-2.patch
new file mode 100644
index 000000000000..7e02e2087799
--- /dev/null
+++ b/srcpkgs/grub/patches/xx-e2fsprogs-2.patch
@@ -0,0 +1,60 @@
+Patch-Source: https://git.savannah.gnu.org/cgit/grub.git/patch/?id=2e9fa73a040462b81bfbfe56c0bc7ad2d30b446b
+useful to support the large_dir ext4 feature
+--
+From 2e9fa73a040462b81bfbfe56c0bc7ad2d30b446b Mon Sep 17 00:00:00 2001
+From: Theodore Ts'o <tytso@mit.edu>
+Date: Tue, 30 Aug 2022 22:41:59 -0400
+Subject: fs/ext2: Ignore the large_dir incompat feature
+
+Recently, ext4 added the large_dir feature, which adds support for
+a 3 level htree directory support.
+
+The GRUB supports existing file systems with htree directories by
+ignoring their existence, and since the index nodes for the hash tree
+look like deleted directory entries (by design), the GRUB can simply do
+a brute force O(n) linear search of directories. The same is true for
+3 level deep htrees indicated by large_dir feature flag.
+
+Hence, it is safe for the GRUB to ignore the large_dir incompat feature.
+
+Fixes: https://savannah.gnu.org/bugs/?61606
+
+Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/fs/ext2.c | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/grub-core/fs/ext2.c b/grub-core/fs/ext2.c
+index 0989e26..e1cc5e6 100644
+--- a/grub-core/fs/ext2.c
++++ b/grub-core/fs/ext2.c
+@@ -104,6 +104,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
+ #define EXT4_FEATURE_INCOMPAT_MMP 0x0100
+ #define EXT4_FEATURE_INCOMPAT_FLEX_BG 0x0200
+ #define EXT4_FEATURE_INCOMPAT_CSUM_SEED 0x2000
++#define EXT4_FEATURE_INCOMPAT_LARGEDIR 0x4000 /* >2GB or 3 level htree */
+ #define EXT4_FEATURE_INCOMPAT_ENCRYPT 0x10000
+
+ /* The set of back-incompatible features this driver DOES support. Add (OR)
+@@ -129,10 +130,17 @@ GRUB_MOD_LICENSE ("GPLv3+");
+ * 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.
++ * large_dir: Not back-incompatible given that the GRUB ext2 driver does
++ * not implement EXT2_FEATURE_COMPAT_DIR_INDEX. If the GRUB
++ * eventually supports the htree feature (aka dir_index)
++ * it should support 3 level htrees and then move
++ * EXT4_FEATURE_INCOMPAT_LARGEDIR to
++ * EXT2_DRIVER_SUPPORTED_INCOMPAT.
+ */
+ #define EXT2_DRIVER_IGNORED_INCOMPAT ( EXT3_FEATURE_INCOMPAT_RECOVER \
+ | EXT4_FEATURE_INCOMPAT_MMP \
+- | EXT4_FEATURE_INCOMPAT_CSUM_SEED)
++ | EXT4_FEATURE_INCOMPAT_CSUM_SEED \
++ | EXT4_FEATURE_INCOMPAT_LARGEDIR)
+
+ #define EXT3_JOURNAL_MAGIC_NUMBER 0xc03b3998U
+
+--
+cgit v1.1
diff --git a/srcpkgs/grub/template b/srcpkgs/grub/template
index b4d3b07af620..7294fa503f3a 100644
--- a/srcpkgs/grub/template
+++ b/srcpkgs/grub/template
@@ -1,7 +1,7 @@
# Template file for 'grub'
pkgname=grub
version=2.06
-revision=2
+revision=3
hostmakedepends="python3 pkg-config flex freetype-devel font-unifont-bdf help2man
automake gettext-devel-tools"
makedepends="libusb-compat-devel ncurses-devel freetype-devel
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: e2fsprogs: update to 1.47.0, add fuse-devel to makedepends, split fus…
2023-02-08 22:28 [PR PATCH] e2fsprogs: update to 1.47.0, add fuse-devel to makedepends, split fus… dkwo
` (11 preceding siblings ...)
2023-05-16 20:19 ` [PR PATCH] [Updated] " dkwo
@ 2023-05-18 15:43 ` piso77
2023-05-18 15:50 ` [PR PATCH] [Updated] " dkwo
` (2 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: piso77 @ 2023-05-18 15:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1148 bytes --]
New comment by piso77 on void-packages repository
https://github.com/void-linux/void-packages/pull/42160#issuecomment-1553252803
Comment:
e2fsprogs built fine, grub on the other hand:
...
=> grub-2.06_3: installing host dependencies: python3-3.11.3_1 pkg-config-0.29.2_3 flex-2.6.4_3 freetype-devel-2.13.0_1 font-unifont-bdf-15.0.01_1 help2man-1.49.2_1 automake-1.16.5_1 gettext-devel-tools-0.21_4 ...
=> grub-2.06_3: installing target dependencies: libusb-compat-devel-0.1.8_1 ncurses-devel-6.3_3 freetype-devel-2.13.0_1 liblzma-devel-5.4.3_1 device-mapper-devel-2.02.187_2 fuse-devel-2.9.9_1 ...
=> grub-2.06_3: removing autodeps, please wait...
=> ERROR: grub-2.06_3: failed to install target dependencies! (error 19)
Package `freetype-devel-2.13.0_1' already installed.
ncurses-libs-6.3_3 in transaction breaks installed pkg `ncurses-6.4_1'
Transaction aborted due to unresolved dependencies.
=> ERROR: Please see above for the real error, exiting...
$ git lg --oneline
a6474c0bf6 (HEAD, e2fs-fix/e2fs) grub: patch for e2fsprogs
2478716a6b e2fsprogs: update to 1.47.0, add fuse-devel to makedepends, split fuse2fs subpkg
...
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PR PATCH] [Updated] e2fsprogs: update to 1.47.0, add fuse-devel to makedepends, split fus…
2023-02-08 22:28 [PR PATCH] e2fsprogs: update to 1.47.0, add fuse-devel to makedepends, split fus… dkwo
` (12 preceding siblings ...)
2023-05-18 15:43 ` piso77
@ 2023-05-18 15:50 ` dkwo
2023-05-18 15:51 ` dkwo
2023-05-25 8:34 ` [PR PATCH] [Merged]: " classabbyamp
15 siblings, 0 replies; 17+ messages in thread
From: dkwo @ 2023-05-18 15:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 562 bytes --]
There is an updated pull request by dkwo against master on the void-packages repository
https://github.com/dkwo/void-packages e2fs
https://github.com/void-linux/void-packages/pull/42160
e2fsprogs: update to 1.47.0, add fuse-devel to makedepends, split fus…
…e2fs subpkg
- I tested the changes in this PR: no
- I built this PR locally for my native architecture, (x86_64-musl)
fixes https://github.com/void-linux/void-packages/issues/42150 @Gottox @danjenson
A patch file from https://github.com/void-linux/void-packages/pull/42160.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-e2fs-42160.patch --]
[-- Type: text/x-diff, Size: 9229 bytes --]
From 2c59d9701c09e937e66ee7b466784c299a91e0b2 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 8 Feb 2023 17:20:46 -0500
Subject: [PATCH 1/2] e2fsprogs: update to 1.47.0, add fuse-devel to
makedepends, split fuse2fs subpkg
---
srcpkgs/e2fsprogs/template | 15 ++++++++++++---
srcpkgs/fuse2fs | 1 +
2 files changed, 13 insertions(+), 3 deletions(-)
create mode 120000 srcpkgs/fuse2fs
diff --git a/srcpkgs/e2fsprogs/template b/srcpkgs/e2fsprogs/template
index a32c50b823b5..7b41eb0ac1d7 100644
--- a/srcpkgs/e2fsprogs/template
+++ b/srcpkgs/e2fsprogs/template
@@ -1,6 +1,6 @@
# Template file for 'e2fsprogs'
pkgname=e2fsprogs
-version=1.46.5
+version=1.47.0
revision=1
build_style=gnu-configure
configure_args="--enable-elf-shlibs --disable-fsck
@@ -10,14 +10,14 @@ configure_args="--enable-elf-shlibs --disable-fsck
--sbindir=/usr/bin --libdir=/usr/lib e2fsprogs_cv_struct_st_flags=no"
make_install_args="install-libs"
hostmakedepends="texinfo pkg-config"
-makedepends="libuuid-devel libblkid-devel"
+makedepends="libuuid-devel libblkid-devel fuse-devel"
checkdepends="perl tar"
short_desc="Ext2/3/4 Filesystem Utilities"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="http://e2fsprogs.sourceforge.net/"
distfiles="${KERNEL_SITE}/kernel/people/tytso/e2fsprogs/v${version}/e2fsprogs-${version}.tar.xz"
-checksum=2f16c9176704cf645dc69d5b15ff704ae722d665df38b2ed3cfc249757d8d81e
+checksum=144af53f2bbd921cef6f8bea88bb9faddca865da3fbc657cc9b4d2001097d5db
conf_files="/etc/mke2fs.conf /etc/e2scrub.conf"
do_check() {
@@ -55,9 +55,18 @@ e2fsprogs-devel_package() {
vmove "usr/share/info/libext2fs.info*"
}
}
+
e2fsprogs-libs_package() {
short_desc+=" - shared libraries"
pkg_install() {
vmove "usr/lib/*.so.*"
}
}
+
+fuse2fs_package() {
+ short_desc+=" - driver for FUSE"
+ pkg_install() {
+ vmove usr/bin/fuse2fs
+ vmove usr/share/man/man1/fuse2fs.1
+ }
+}
diff --git a/srcpkgs/fuse2fs b/srcpkgs/fuse2fs
new file mode 120000
index 000000000000..84c526343bfc
--- /dev/null
+++ b/srcpkgs/fuse2fs
@@ -0,0 +1 @@
+e2fsprogs
\ No newline at end of file
From ecf233d43b50d0eae136d085b80b59636bd5d5d2 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sat, 25 Mar 2023 15:26:13 -0400
Subject: [PATCH 2/2] grub: patch for e2fsprogs
---
srcpkgs/grub/patches/xx-e2fsprogs-1.patch | 62 +++++++++++++++++++++++
srcpkgs/grub/patches/xx-e2fsprogs-2.patch | 60 ++++++++++++++++++++++
srcpkgs/grub/template | 2 +-
3 files changed, 123 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/grub/patches/xx-e2fsprogs-1.patch
create mode 100644 srcpkgs/grub/patches/xx-e2fsprogs-2.patch
diff --git a/srcpkgs/grub/patches/xx-e2fsprogs-1.patch b/srcpkgs/grub/patches/xx-e2fsprogs-1.patch
new file mode 100644
index 000000000000..5cd83273be1a
--- /dev/null
+++ b/srcpkgs/grub/patches/xx-e2fsprogs-1.patch
@@ -0,0 +1,62 @@
+Patch-Source: https://git.savannah.gnu.org/cgit/grub.git/commit/?id=7fd5feff97c4b1f446f8fcf6d37aca0c64e7c763
+useful because e2fsprogs 1.47 defaults to this enabled, and grub won't touch it
+--
+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/srcpkgs/grub/patches/xx-e2fsprogs-2.patch b/srcpkgs/grub/patches/xx-e2fsprogs-2.patch
new file mode 100644
index 000000000000..7e02e2087799
--- /dev/null
+++ b/srcpkgs/grub/patches/xx-e2fsprogs-2.patch
@@ -0,0 +1,60 @@
+Patch-Source: https://git.savannah.gnu.org/cgit/grub.git/patch/?id=2e9fa73a040462b81bfbfe56c0bc7ad2d30b446b
+useful to support the large_dir ext4 feature
+--
+From 2e9fa73a040462b81bfbfe56c0bc7ad2d30b446b Mon Sep 17 00:00:00 2001
+From: Theodore Ts'o <tytso@mit.edu>
+Date: Tue, 30 Aug 2022 22:41:59 -0400
+Subject: fs/ext2: Ignore the large_dir incompat feature
+
+Recently, ext4 added the large_dir feature, which adds support for
+a 3 level htree directory support.
+
+The GRUB supports existing file systems with htree directories by
+ignoring their existence, and since the index nodes for the hash tree
+look like deleted directory entries (by design), the GRUB can simply do
+a brute force O(n) linear search of directories. The same is true for
+3 level deep htrees indicated by large_dir feature flag.
+
+Hence, it is safe for the GRUB to ignore the large_dir incompat feature.
+
+Fixes: https://savannah.gnu.org/bugs/?61606
+
+Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ grub-core/fs/ext2.c | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/grub-core/fs/ext2.c b/grub-core/fs/ext2.c
+index 0989e26..e1cc5e6 100644
+--- a/grub-core/fs/ext2.c
++++ b/grub-core/fs/ext2.c
+@@ -104,6 +104,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
+ #define EXT4_FEATURE_INCOMPAT_MMP 0x0100
+ #define EXT4_FEATURE_INCOMPAT_FLEX_BG 0x0200
+ #define EXT4_FEATURE_INCOMPAT_CSUM_SEED 0x2000
++#define EXT4_FEATURE_INCOMPAT_LARGEDIR 0x4000 /* >2GB or 3 level htree */
+ #define EXT4_FEATURE_INCOMPAT_ENCRYPT 0x10000
+
+ /* The set of back-incompatible features this driver DOES support. Add (OR)
+@@ -129,10 +130,17 @@ GRUB_MOD_LICENSE ("GPLv3+");
+ * 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.
++ * large_dir: Not back-incompatible given that the GRUB ext2 driver does
++ * not implement EXT2_FEATURE_COMPAT_DIR_INDEX. If the GRUB
++ * eventually supports the htree feature (aka dir_index)
++ * it should support 3 level htrees and then move
++ * EXT4_FEATURE_INCOMPAT_LARGEDIR to
++ * EXT2_DRIVER_SUPPORTED_INCOMPAT.
+ */
+ #define EXT2_DRIVER_IGNORED_INCOMPAT ( EXT3_FEATURE_INCOMPAT_RECOVER \
+ | EXT4_FEATURE_INCOMPAT_MMP \
+- | EXT4_FEATURE_INCOMPAT_CSUM_SEED)
++ | EXT4_FEATURE_INCOMPAT_CSUM_SEED \
++ | EXT4_FEATURE_INCOMPAT_LARGEDIR)
+
+ #define EXT3_JOURNAL_MAGIC_NUMBER 0xc03b3998U
+
+--
+cgit v1.1
diff --git a/srcpkgs/grub/template b/srcpkgs/grub/template
index b4d3b07af620..7294fa503f3a 100644
--- a/srcpkgs/grub/template
+++ b/srcpkgs/grub/template
@@ -1,7 +1,7 @@
# Template file for 'grub'
pkgname=grub
version=2.06
-revision=2
+revision=3
hostmakedepends="python3 pkg-config flex freetype-devel font-unifont-bdf help2man
automake gettext-devel-tools"
makedepends="libusb-compat-devel ncurses-devel freetype-devel
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: e2fsprogs: update to 1.47.0, add fuse-devel to makedepends, split fus…
2023-02-08 22:28 [PR PATCH] e2fsprogs: update to 1.47.0, add fuse-devel to makedepends, split fus… dkwo
` (13 preceding siblings ...)
2023-05-18 15:50 ` [PR PATCH] [Updated] " dkwo
@ 2023-05-18 15:51 ` dkwo
2023-05-25 8:34 ` [PR PATCH] [Merged]: " classabbyamp
15 siblings, 0 replies; 17+ messages in thread
From: dkwo @ 2023-05-18 15:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 171 bytes --]
New comment by dkwo on void-packages repository
https://github.com/void-linux/void-packages/pull/42160#issuecomment-1553262703
Comment:
Simply rebasing should fix that.
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PR PATCH] [Merged]: e2fsprogs: update to 1.47.0, add fuse-devel to makedepends, split fus…
2023-02-08 22:28 [PR PATCH] e2fsprogs: update to 1.47.0, add fuse-devel to makedepends, split fus… dkwo
` (14 preceding siblings ...)
2023-05-18 15:51 ` dkwo
@ 2023-05-25 8:34 ` classabbyamp
15 siblings, 0 replies; 17+ messages in thread
From: classabbyamp @ 2023-05-25 8:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 415 bytes --]
There's a merged pull request on the void-packages repository
e2fsprogs: update to 1.47.0, add fuse-devel to makedepends, split fus…
https://github.com/void-linux/void-packages/pull/42160
Description:
…e2fs subpkg
- I tested the changes in this PR: no
- I built this PR locally for my native architecture, (x86_64-musl)
fixes https://github.com/void-linux/void-packages/issues/42150 @Gottox @danjenson
^ permalink raw reply [flat|nested] 17+ messages in thread