From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 625BF159C9B for ; Thu, 8 Aug 2024 10:57:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9DFB9E2C29; Thu, 8 Aug 2024 10:57:00 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7A92EE2C29 for ; Thu, 8 Aug 2024 10:57:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6E70C342FA8 for ; Thu, 8 Aug 2024 10:56:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0B4881E7E for ; Thu, 8 Aug 2024 10:56:58 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1723114594.a429b970949c21e97dfc4e6b8cee01ed0bb4e2ff.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/btrfs-progs/btrfs-progs-6.9.2.ebuild sys-fs/btrfs-progs/metadata.xml X-VCS-Directories: sys-fs/btrfs-progs/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a429b970949c21e97dfc4e6b8cee01ed0bb4e2ff X-VCS-Branch: master Date: Thu, 8 Aug 2024 10:56:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a73d44bb-b48c-499e-bf5b-5861d5491d7d X-Archives-Hash: 6897773537b9e05b26eeb7097ad04329 commit: a429b970949c21e97dfc4e6b8cee01ed0bb4e2ff Author: Mark Harmstone harmstone com> AuthorDate: Thu Aug 1 15:55:02 2024 +0000 Commit: Sam James gentoo org> CommitDate: Thu Aug 8 10:56:34 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a429b970 sys-fs/btrfs-progs: add experimental USE flag Add experimental USE flag to btrfs-progs, which sets the --enable-experimental configure option and installs btrfs-corrupt-block, which is otherwise ignored. Both of these changes are required for xfstests to function correctly. Closes: https://bugs.gentoo.org/937458 Signed-off-by: Mark Harmstone harmstone.com> Closes: https://github.com/gentoo/gentoo/pull/37918 Signed-off-by: Sam James gentoo.org> sys-fs/btrfs-progs/btrfs-progs-6.9.2.ebuild | 9 +++++++-- sys-fs/btrfs-progs/metadata.xml | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.9.2.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.9.2.ebuild index 0fe0ac94b99c..432b2b58e34d 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-6.9.2.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-6.9.2.ebuild @@ -35,7 +35,7 @@ HOMEPAGE="https://btrfs.readthedocs.io/en/latest/" LICENSE="GPL-2" SLOT="0/0" # libbtrfs soname -IUSE="+convert +man reiserfs static static-libs udev +zstd" +IUSE="+convert +man experimental reiserfs static static-libs udev +zstd" # Could support it with just !systemd => eudev, see mdadm, but let's # see if someone asks for it first. REQUIRED_USE="static? ( !udev )" @@ -131,7 +131,7 @@ src_configure() { --bindir="${EPREFIX}"/sbin --enable-lzo - --disable-experimental + $(use_enable experimental) --disable-python $(use_enable convert) $(use_enable man documentation) @@ -171,6 +171,11 @@ src_install() { emake V=1 DESTDIR="${D}" install "${makeargs[@]}" + if use experimental; then + exeinto /sbin + doexe btrfs-corrupt-block + fi + newbashcomp btrfs-completion btrfs } diff --git a/sys-fs/btrfs-progs/metadata.xml b/sys-fs/btrfs-progs/metadata.xml index e0d9388ce73c..9bd0c43c582b 100644 --- a/sys-fs/btrfs-progs/metadata.xml +++ b/sys-fs/btrfs-progs/metadata.xml @@ -7,6 +7,7 @@ Build ext2 conversion utility (btrfs-convert) + Enable unstable and experimental features and install btrfs-corrupt-block, as needed by xfstests Enable reiserfs support in btrfs-convert tool. Build static binaries in addition to the dynamic ones