Re: [OE-core][whinlatter][PATCH 11/12] e2fsprogs: upgrade 1.47.3 -> 1.47.4

["Yoann Congal" <yoann.congal@smile.fr>]

On Wed Mar 25, 2026 at 3:18 AM CET, Ankur Tyagi via lists.openembedded.org wrote:
> From: Wang Mingyu <wangmy@fujitsu.com>
>
> 0001-misc-create_inode.c-Fix-for-file-larger-than-2GB.patch
> removed since it's inclued in 1.47.4
>
> Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> (cherry picked from commit b14266b4c27e7e3f37a1057ab694c6b21b66b83a)
>
> Release Notes:
> https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/tree/doc/RelNotes/v1.47.4.txt?h=v1.47.4
>
> Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>

Hello,

I'm sorry but this upgrade contains feature change and, because of that
is not eligible for stable merge:
> E2fsprogs 1.47.4 (March 6, 2025)
> ================================
> 
> Updates/Fixes since v1.47.3:
> 
> UI and Features
> ---------------
> 
> [...]
> 
> Add mke2fs extended option in root_selinux to set a SELinux security
> context label for the root directory.
> 
> Enable mke2fs to support multiple -E options in the command line.

Regards,

> ---
>  ...inode.c-Fix-for-file-larger-than-2GB.patch | 40 -------------------
>  ...2fsprogs_1.47.3.bb => e2fsprogs_1.47.4.bb} |  3 +-
>  2 files changed, 1 insertion(+), 42 deletions(-)
>  delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-misc-create_inode.c-Fix-for-file-larger-than-2GB.patch
>  rename meta/recipes-devtools/e2fsprogs/{e2fsprogs_1.47.3.bb => e2fsprogs_1.47.4.bb} (97%)
>
> diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-misc-create_inode.c-Fix-for-file-larger-than-2GB.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-misc-create_inode.c-Fix-for-file-larger-than-2GB.patch
> deleted file mode 100644
> index 1c578022fb..0000000000
> --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-misc-create_inode.c-Fix-for-file-larger-than-2GB.patch
> +++ /dev/null
> @@ -1,40 +0,0 @@
> -From 6359e0ec8ef249d202dbb8583a6e430f20c5b1a0 Mon Sep 17 00:00:00 2001
> -From: Robert Yang <liezhi.yang@windriver.com>
> -Date: Sun, 30 Nov 2025 21:47:50 +0800
> -Subject: [PATCH] misc/create_inode.c: Fix for file larger than 2GB
> -
> -Fixed:
> -$ dd if=/dev/zero of=../image.ext4 bs=1M count=4k
> -$ dd if=/dev/random of=../rootfs/largefile bs=1M count=3k
> -$ ./misc/mke2fs -t ext4 -d ../rootfs/ ../image.ext4
> -__populate_fs: Ext2 file too big while writing file "largefile"
> -mke2fs: Ext2 file too big while populating file system
> -
> -This was because the offset is overflow, use __u64 to fix the problem.
> -
> -Another code which uses ext2_off_t is copy_fs_verity_data(), but it only copies
> -the metadata, so it should be enough large for it, just leave it there.
> -
> -Upstream-Status: Submitted [https://github.com/tytso/e2fsprogs/pull/258]
> -
> -Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ----
> - misc/create_inode.c | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/misc/create_inode.c b/misc/create_inode.c
> -index 624efc03..14273534 100644
> ---- a/misc/create_inode.c
> -+++ b/misc/create_inode.c
> -@@ -414,7 +414,7 @@ static ssize_t my_pread(int fd, void *buf, size_t count, off_t offset)
> - }
> - #endif /* !defined HAVE_PREAD64 && !defined HAVE_PREAD */
> - 
> --static errcode_t write_all(ext2_file_t e2_file, ext2_off_t off, const char *buf, unsigned int n_bytes) {
> -+static errcode_t write_all(ext2_file_t e2_file, __u64 off, const char *buf, unsigned int n_bytes) {
> - 	errcode_t err = ext2fs_file_llseek(e2_file, off, EXT2_SEEK_SET, NULL);
> - 	if (err)
> - 		return err;
> --- 
> -2.34.1
> -
> diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.47.3.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.47.4.bb
> similarity index 97%
> rename from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.47.3.bb
> rename to meta/recipes-devtools/e2fsprogs/e2fsprogs_1.47.4.bb
> index 40658399d9..90f8f37b8e 100644
> --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.47.3.bb
> +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.47.4.bb
> @@ -4,14 +4,13 @@ SRC_URI += "file://remove.ldconfig.call.patch \
>             file://run-ptest \
>             file://ptest.patch \
>             file://mkdir_p.patch \
> -           file://0001-misc-create_inode.c-Fix-for-file-larger-than-2GB.patch \
>             "
>  SRC_URI:append:class-native = " \
>             file://e2fsprogs-fix-missing-check-for-permission-denied.patch \
>             file://quiet-debugfs.patch \
>             "
>  
> -SRCREV = "da631e117dcf8797bfda0f48bdaa05ac0fbcf7af"
> +SRCREV = "ece89fac4603e400155b7bbf6326284f8511bca9"
>  UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+(\.\d+)*)$"
>  
>  EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \


-- 
Yoann Congal
Smile ECS