From nobody Wed Jul 02 16:12:36 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bXQ0N2Q33z60ckN; Wed, 02 Jul 2025 16:12:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bXQ0N1DBWz41nQ; Wed, 02 Jul 2025 16:12:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751472756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MQs+z8ZXn70EAUI04d1e6y2y9BrMU4hdSS8xqOD2RjM=; b=dzYBB9p3sbkwimsmYixZ+iYE3wlvCFITQ7XfHDP0P11k0xPDFZEYYbwcC9SCMGb13M6VdV 7Z0TmK/VSyuTKcBVFlu0s8Fu347JYdF/N2hG+T7YH/g4Mj/2/ctYkDvOVDStz0jjvUyn4o 3sRJk0LaqH7XlrEkXpUjk54oYJVb8erdwSvx1zPDDHUFKcZl97GY9J42LLj/p1RXVmePwF mUabFkgtkSSVLt8YVCvrgJiyXJ6jJG1Z+KueSaEBJM0g4c9S9oAQoxqpmNkfxnQqY3U7AS 4koUUPreAZiX+LwOr0VMZVCa6YhR0MlpX5RH6CuRIonxNuQf9Y8jdvjwqYnMgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751472756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MQs+z8ZXn70EAUI04d1e6y2y9BrMU4hdSS8xqOD2RjM=; b=Nyl/6WnZJ7V0R1giC6Ppx1Rf+4zwgI1nkXdXTdjlARBDa0VKiT+XHM6lJkBendjEZTJ+yS dIUWe3Mlr2YiUl30IhNdm+BpCFdeQAuLH4O1SrSauKYHBNc7X5IIxM9Tv6/weiQ3pDSXxk uvkKUYmaUI1POdWQ030aAVNdgOOR7KQxw7AM9bCxeJpexqI1chp2KjtueC55lxBAtLK0tN D4bcdLWSXJDCigJcjzQ0AVqF+JarLCAMmXIoFOSbuT/oyCJxW1aMWAx6+40UuGhmT7/Pjv Cbr9Gw72EAIWs2jZtj/IauYqG23mQmMGyCFsg0Svp4ynhPZFJ4eofzys7rz5qA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751472756; a=rsa-sha256; cv=none; b=Ld4GvK6HQugnrl4napISApKRW54/qTNQF7EaZ+YqwWIYpwTP2XKemVa54tGDpGCmHrSE9g mebtXm5paIcMRZ9DZvouQzUXCx7XE/1TpbBuQE79w24C+vKCnHRQdryri7Z35Yq9MVMWNI 7xTbbgHvP2aFu3BEMn+slBnejg4UlOP/UUaFW66qZUEqmdiLtCzDvf45yuhR1ZGj8eLE/7 JfuyLDAoTNYSQWWDkyaE5+xfVdire84HV89WvNfx6YOhfAHrw2kURlPKnY+2KivItrvXyd b1Pf9ZCz1mA03hO7wxxW8A1R07Ep7WUWGIhT3/c8hBisL3lpm+WmyiBqG3n01g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bXQ0N0pR6zBLQ; Wed, 02 Jul 2025 16:12:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 562GCa2M008894; Wed, 2 Jul 2025 16:12:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 562GCaHh008891; Wed, 2 Jul 2025 16:12:36 GMT (envelope-from git) Date: Wed, 2 Jul 2025 16:12:36 GMT Message-Id: <202507021612.562GCaHh008891@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: a64852bd4fcc - main - filesystems/e2fsprogs*: default-enable FUSEFS ALLTESTS List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a64852bd4fcced6b2a0f0aa0d8aa664c0766896f Auto-Submitted: auto-generated The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=a64852bd4fcced6b2a0f0aa0d8aa664c0766896f commit a64852bd4fcced6b2a0f0aa0d8aa664c0766896f Author: Matthias Andree AuthorDate: 2025-07-02 16:00:57 +0000 Commit: Matthias Andree 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