git: a64852bd4fcc - main - filesystems/e2fsprogs*: default-enable FUSEFS ALLTESTS
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 02 Jul 2025 16:12:36 UTC
The branch main has been updated by mandree:
URL: https://cgit.FreeBSD.org/ports/commit/?id=a64852bd4fcced6b2a0f0aa0d8aa664c0766896f
commit a64852bd4fcced6b2a0f0aa0d8aa664c0766896f
Author: Matthias Andree <mandree@FreeBSD.org>
AuthorDate: 2025-07-02 16:00:57 +0000
Commit: Matthias Andree <mandree@FreeBSD.org>
CommitDate: 2025-07-02 16:05:47 +0000
filesystems/e2fsprogs*: default-enable FUSEFS ALLTESTS
I figured that the FreeBSD 14.3 kernel won't mount an ext[234]fs
created with inline_data option, while fuse2fs can do that.
Let's make that default, and since I've been successfully testing
on my amd64 computers with ALLTESTS (without SLOWTESTS), switch.
---
filesystems/e2fsprogs-core/Makefile | 43 +++++++++++++++++++------------------
filesystems/e2fsprogs/Makefile | 2 +-
2 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/filesystems/e2fsprogs-core/Makefile b/filesystems/e2fsprogs-core/Makefile
index 12fdf5fb3da3..74fc7d58dc0f 100644
--- a/filesystems/e2fsprogs-core/Makefile
+++ b/filesystems/e2fsprogs-core/Makefile
@@ -1,6 +1,6 @@
PORTNAME= e2fsprogs
PORTVERSION= 1.47.2
-PORTREVISION?= 2 # NOTE: when bumping PORTREVISION, also bump ../e2fsprogs/Makefile!
+PORTREVISION?= 3 # NOTE: when bumping PORTREVISION, also bump ../e2fsprogs/Makefile!
CATEGORIES?= filesystems sysutils
MASTER_SITES= KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION}
@@ -37,11 +37,11 @@ CONFIGURE_ARGS?=--disable-fsck \
--with-root-prefix='${PREFIX}' \
LDFLAGS='${LDFLAGS} -L${LOCALBASE}/lib -Wl,--rpath -Wl,${LOCALBASE}/lib/e2fsprogs'
CONFIGURE_ENV?= LIBS='-Wl,--as-needed ${LIBS} -lexecinfo -lelf'
-CPPFLAGS+= ${_FUSEFS_CFLAGS} -I${WRKSRC}/lib -I${LOCALBASE}/include
-CFLAGS+= -Wno-unused-command-line-argument # -D_FILE_OFFSET_BITS=64 # the latter for fuse-libs
MAKE_ARGS+= pkgconfigdir='${PREFIX}/libdata/pkgconfig'
MAKE_ENV+= CHECK_CMD=@true
+CPPFLAGS+= ${_FUSEFS_CFLAGS} -I${WRKSRC}/lib -I${LOCALBASE}/include
+CFLAGS+= -Wno-unused-command-line-argument # -D_FILE_OFFSET_BITS=64 # the latter for fuse-libs
PIE_UNSAFE= yes
PORTSCOUT= ignore:1 # cannot handle the version in the directory
@@ -51,43 +51,44 @@ CPPFLAGS+= -D__GNUC_PREREQ\(a,b\)=1
INSTALL_TARGET= install install-libs
-OPTIONS_DEFINE= DOCS NLS FUSEFS PARALLELTESTS SLOWTESTS BASHTESTS LIBUNWIND
-OPTIONS_EXCLUDE+= EXAMPLES
-OPTIONS_SUB= yes
+PORTDOCS= NOTICE README RELEASE-NOTES SUBMITTING-PATCHES
+OPTIONS_DEFINE= DOCS NLS BASHTESTS FUSEFS PARALLELTESTS SLOWTESTS LIBUNWIND
+OPTIONS_DEFAULT= FUSEFS ALLTESTS
OPTIONS_SINGLE= SELFTEST
OPTIONS_SINGLE_SELFTEST= NOTESTS SMALLTESTS ALLTESTS
-OPTIONS_DEFAULT= SMALLTESTS
+OPTIONS_EXCLUDE+= EXAMPLES
+OPTIONS_SUB= yes
+
+ALLTESTS_DESC= Run most self-tests (needs more RAM/disk space)
+BASHTESTS_DESC= Enable tests that require the GNU bash shell
FUSEFS_DESC= Build user-land ext2/3/4 FUSE module (slow!)
-SELFTEST_DESC= Choose which set of self-tests to run
+LIBUNWIND_DESC= Backtrace with libunwind (do set WITH_DEBUG_PORTS+=${PKGORIGIN}!)
NOTESTS_DESC= Do not run any self-tests (Tier-1, DISCOURAGED)
-SMALLTESTS_DESC=Run tests that need <500 MB disk space (DEFAULT)
-ALLTESTS_DESC= Run most self-tests (needs more RAM/disk space)
PARALLELTESTS_DESC= Parallelize self-tests (needs more disk space)
+SELFTEST_DESC= Choose which set of self-tests to run
SLOWTESTS_DESC= Enable slow tests that are skipped by default
-BASHTESTS_DESC= Enable tests that require the GNU bash shell
-LIBUNWIND_DESC= Backtrace with libunwind (do set WITH_DEBUG_PORTS+=${PKGORIGIN}!)
+SMALLTESTS_DESC=Run tests that need <500 MB disk space (DEFAULT)
+
+BASHTESTS_BUILD_DEPENDS= ${BASH_CMD}:shells/bash
+BASH_CMD= ${LOCALBASE}/bin/bash
-FUSEFS_CONFIGURE_ENABLE= fuse2fs
FUSEFS_USES= fuse:3
+FUSEFS_CONFIGURE_ENABLE= fuse2fs
# we can't use FUSEFS_CFLAGS, see below for workaround
-FUSEFS_LIBS= -Wl,--as-needed -lfuse3 -lpthread
FUSEFS_LDFLAGS= -L${LOCALBASE}/lib
-
-NLS_USES= gettext iconv:build
-
-BASHTESTS_BUILD_DEPENDS= ${BASH_CMD}:shells/bash
-BASH_CMD= ${LOCALBASE}/bin/bash
+FUSEFS_LIBS= -Wl,--as-needed -lfuse3 -lpthread
LIB_DEPENDS+= libblkid.so:filesystems/libblkid \
libuuid.so:misc/libuuid
LIBUNWIND_LIB_DEPENDS= libunwind.so:devel/libunwind
-LIBUNWIND_LIBS+= -L${LOCALBASE}/lib -lunwind
LIBUNWIND_LDFLAGS+= -rdynamic
+LIBUNWIND_LIBS+= -L${LOCALBASE}/lib -lunwind
LIBUNWIND_EXTRA_PATCHES=${FILESDIR}/extrapatch-e2fsck_sigcatcher.c
-PORTDOCS= NOTICE README RELEASE-NOTES SUBMITTING-PATCHES
+NLS_USES= gettext iconv:build
+
.endif
# even under DEVELOPER, no REINPLACE_CMD warnings desired
diff --git a/filesystems/e2fsprogs/Makefile b/filesystems/e2fsprogs/Makefile
index ff6e1b6bcb05..21f6e3e86452 100644
--- a/filesystems/e2fsprogs/Makefile
+++ b/filesystems/e2fsprogs/Makefile
@@ -1,7 +1,7 @@
PORTNAME= e2fsprogs
CATEGORIES= filesystems sysutils
PORTVERSION= 1.47.2
-PORTREVISION= 2
+PORTREVISION= 3
BUILD_DEPENDS= e2fsprogs-core=${PORTVERSION}${${PORTREVISION} > 0:?_${PORTREVISION}:}:filesystems/e2fsprogs-core
RUN_DEPENDS= ${BUILD_DEPENDS}
DISTFILES= # empty