mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-08-08 08:30:47 -09:00
package/e2fsprogs: bump version to 1.47.4, remove autoreconf
https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/tree/doc/RelNotes/v1.47.4.txt
Removed patch 0001 which is included in this release:
4aba12dc19
Also removed autoreconf and its dependencies which were necessary for
patch 0001.
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
[Julien: fix changelog url in commit log]
Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
Bernd Kuhls
committed by
Julien Olivain
Julien Olivain
parent
489c57a8e9
commit
b1983c1c11
@@ -1,103 +0,0 @@
|
||||
From 1a2ce8cd956065106ae27a36a5000f00ebc4591f Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
Date: Sat, 22 Nov 2025 21:12:23 +0100
|
||||
Subject: [PATCH] configure.ac: check for FS_IOC_READ_VERITY_METADATA
|
||||
availability
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Commit 6bfa843b4435334ac073e42950b48d8bacb54977 ("mke2fs: enable
|
||||
copying of fs-verity metadata") introduced support for reading
|
||||
fs-verity metadata, which requires using the
|
||||
FS_IOC_READ_VERITY_METADATA.
|
||||
|
||||
The code is conditionally compiled when the kernel headers have
|
||||
<linux/fsverity.h> available. Unfortunately, this check is not
|
||||
sufficient: <linux/fsverity.h> was introduced in Linux 5.10, but the
|
||||
FS_IOC_READ_VERITY_METADATA was not introduced before 5.12, so if one
|
||||
is using 5.10 or 5.11 kernel headers, the build fails with:
|
||||
|
||||
./../misc/create_inode.c: In function ‘copy_fs_verity_data’:
|
||||
./../misc/create_inode.c:589:10: error: variable ‘arg’ has initializer but incomplete type
|
||||
589 | struct fsverity_read_metadata_arg arg = {
|
||||
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
[...]
|
||||
./../misc/create_inode.c:600:20: error: ‘FS_IOC_READ_VERITY_METADATA’ undeclared (first use in this function)
|
||||
600 | size = ioctl(fd, FS_IOC_READ_VERITY_METADATA, &arg);
|
||||
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
This commit therefore extends the configure.ac check to ensure that
|
||||
not only <linux/fsverity.h> exists but also that it defines the
|
||||
FS_IOC_READ_VERITY_METADATA ioctl.
|
||||
|
||||
Upstream: https://github.com/tytso/e2fsprogs/pull/256
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
---
|
||||
configure.ac | 18 ++++++++++++++++++
|
||||
misc/create_inode.c | 6 +++---
|
||||
2 files changed, 21 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index a0171163..3e5586a3 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1997,6 +1997,24 @@ OS_IO_FILE=""
|
||||
esac]
|
||||
AC_SUBST(OS_IO_FILE)
|
||||
|
||||
+dnl Check for fsverity ioctl
|
||||
+if test "${ac_cv_header_linux_fsverity_h}" = "yes"; then
|
||||
+ AC_MSG_CHECKING([for FS_IOC_READ_VERITY_METADATA ioctl])
|
||||
+ AC_PREPROC_IFELSE(
|
||||
+ [AC_LANG_PROGRAM([[
|
||||
+#include <linux/fsverity.h>
|
||||
+#ifndef FS_IOC_READ_VERITY_METADATA
|
||||
+# error "FS_IOC_READ_VERITY_METADATA not available"
|
||||
+#endif
|
||||
+]], [])], [
|
||||
+ AC_DEFINE([HAVE_FS_IOC_READ_VERITY_METADATA], [1], [Define to 1 if FS_IOC_READ_VERITY_METADATA ioctl is available])
|
||||
+ AC_MSG_RESULT([yes])
|
||||
+ ],
|
||||
+ [
|
||||
+ AC_MSG_RESULT([no])
|
||||
+ ])
|
||||
+fi
|
||||
+
|
||||
dnl
|
||||
dnl Make our output files, being sure that we create the some miscellaneous
|
||||
dnl directories
|
||||
diff --git a/misc/create_inode.c b/misc/create_inode.c
|
||||
index 624efc03..a7918873 100644
|
||||
--- a/misc/create_inode.c
|
||||
+++ b/misc/create_inode.c
|
||||
@@ -30,7 +30,7 @@
|
||||
#ifdef HAVE_SYS_SYSMACROS_H
|
||||
#include <sys/sysmacros.h>
|
||||
#endif
|
||||
-#ifdef HAVE_LINUX_FSVERITY_H
|
||||
+#if defined(HAVE_LINUX_FSVERITY_H) && defined(HAVE_FS_IOC_READ_VERITY_METADATA)
|
||||
#include <linux/fsverity.h>
|
||||
#include <linux/fs.h>
|
||||
#endif
|
||||
@@ -569,7 +569,7 @@ out:
|
||||
}
|
||||
#endif /* FS_IOC_FIEMAP */
|
||||
|
||||
-#ifdef HAVE_LINUX_FSVERITY_H
|
||||
+#if defined(HAVE_LINUX_FSVERITY_H) && defined(HAVE_FS_IOC_READ_VERITY_METADATA)
|
||||
static inline off_t round_up(off_t n, off_t blksz, off_t bias)
|
||||
{
|
||||
return ((n - bias + (blksz - 1)) & ~(blksz - 1)) + bias;
|
||||
@@ -738,7 +738,7 @@ static errcode_t copy_file(ext2_filsys fs, int fd, struct stat *statbuf,
|
||||
err = copy_file_chunk(fs, fd, e2_file, 0, statbuf->st_size, buf,
|
||||
zerobuf);
|
||||
|
||||
-#ifdef HAVE_LINUX_FSVERITY_H
|
||||
+#if defined(HAVE_LINUX_FSVERITY_H) && defined(HAVE_FS_IOC_READ_VERITY_METADATA)
|
||||
if (!err && (flags & EXT4_VERITY_FL))
|
||||
err = copy_fs_verity(fs, fd, e2_file, statbuf->st_size);
|
||||
#endif
|
||||
--
|
||||
2.51.1
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# From https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.47.3/sha256sums.asc
|
||||
sha256 857e6ef800feaa2bb4578fbc810214be5d3c88b072ea53c5384733a965737329 e2fsprogs-1.47.3.tar.xz
|
||||
# From https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.47.4/sha256sums.asc
|
||||
sha256 fd5bf388cbdbe006a3d3b318d983b2948382440acc85a87f1e7d108653e8db0b e2fsprogs-1.47.4.tar.xz
|
||||
# Locally calculated
|
||||
sha256 5da5ef153e559c1d990d4c3eedbedd4442db892d37eae1f35fff069de8ec9020 NOTICE
|
||||
sha256 032989b508f1a72ebee5b3417e55d06d473f9ee203e45ab11864a7e49cdec63d lib/ss/mit-sipb-copyright.h
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
E2FSPROGS_VERSION = 1.47.3
|
||||
E2FSPROGS_VERSION = 1.47.4
|
||||
E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VERSION).tar.xz
|
||||
E2FSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION)
|
||||
E2FSPROGS_LICENSE = GPL-2.0, MIT-like with advertising clause (libss and libet)
|
||||
@@ -18,13 +18,6 @@ E2FSPROGS_INSTALL_STAGING = YES
|
||||
E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux
|
||||
HOST_E2FSPROGS_DEPENDENCIES = host-pkgconf host-util-linux
|
||||
|
||||
# 0001-configure.ac-check-for-FS_IOC_READ_VERITY_METADATA-a.patch
|
||||
# the additional dependencies are only needed for autoreconf
|
||||
E2FSPROGS_AUTORECONF = YES
|
||||
E2FSPROGS_AUTORECONF_OPTS = --include=$(HOST_DIR)/share/autoconf-archive
|
||||
E2FSPROGS_DEPENDENCIES += host-gettext host-autoconf-archive
|
||||
HOST_E2FSPROGS_DEPENDENCIES += host-gettext host-autoconf-archive
|
||||
|
||||
E2FSPROGS_SELINUX_MODULES = fstools
|
||||
|
||||
# e4defrag doesn't build on older systems like RHEL5.x, and we don't
|
||||
|
||||
Reference in New Issue
Block a user