mirror of
https://github.com/flatcar/scripts.git
synced 2026-05-04 19:56:32 +02:00
sys-fs/xfsprogs: Sync with Gentoo
It's from Gentoo commit 383297927458e33bf4ca31525b4c13c1965053af. Signed-off-by: Flatcar Buildbot <buildbot@flatcar-linux.org>
This commit is contained in:
Flatcar Buildbot
Krzesimir Nowak
parent
e48ec78040
commit
4288e7f33d
@ -1,7 +1,2 @@
|
||||
DIST xfsprogs-6.12.0.tar.xz 1471672 BLAKE2B 471832b07bc2cca5bde6e1ac253d151b0889f7b7be75ae322727299a83329899d4c3aac8217b069fee3f7abc6bc964127c35a206b04cb796999497f5ad701f44 SHA512 020810b4a261f4ab4eb94aae813f22b26bb9f17705967198189509e684422361dd80af938e4a77cf326353d5d61d5aeaaee9a34e8a7b8ed1dddd63b7ad1b0510
|
||||
DIST xfsprogs-6.13.0.tar.xz 1506676 BLAKE2B 98a8b51ba7fb7f58ea292e9c4624ca3c2337d962f832d92549763a85036b8ba0579de0d172465227eb51cc5c51e3b5d4f54144690001ea8b6795b3a43bc41b9b SHA512 9fd73c8585cd295b79b227cd5855407da4b3ea2d40a1ca82e0a93887644b497cced182960bcd8f3c45805dda4a244d1555fd49da5d7e82fe4525d345c766a63a
|
||||
DIST xfsprogs-6.14.0.tar.xz 1543640 BLAKE2B 5ef446b2055356627cd91ebfe9bb07388f9b5a12fd8c530b83980261b2dc3ddfa47f809114f0f238ef787ed687d324abe82427fdc2b3ecc3171d4d06615dd0c4 SHA512 249a64fb5a92ceb9e58b75a270a90773cfe2c90e863d3f9853c14b3eb0f414bf55b8b67c220a1d7386894ef9295622e224977bd3c6600c9dcba826cb4a634f49
|
||||
DIST xfsprogs-6.15.0.tar.xz 1550568 BLAKE2B fe6806ac8235c0984055f7b969b11bc0c49ee8bb8f49f7a4c3bf03f1ebf839cccb86cdb6c4946723a1b8007422e057fb7b865cc60081037920e8208cfcab16e9 SHA512 975c9c7fe476b02da50da74eb599f804f2b27a638a74b807e1f69d93d0d150d19bf6d5036601b96febe557a6c51065d8cf22eef5fda92a6d7f084ac1d7647496
|
||||
DIST xfsprogs-6.16.0.tar.xz 1557452 BLAKE2B ae4087c887b4c9d2fcc4b5341ca3c7d0333cf2132111179feee4b765ba9a1cc94143723b2bc4bcd8658bd7902871266af69293c77d715de1d0e878dc76b42e8e SHA512 333ef39f38d0fa46742b7fd28ebc6482e90abb32e58634b3a93aa24f0202c55f4dc32f1b00a9859c6e64efada4d844c3a995a913520cb00d5e1a4f1a83da848d
|
||||
DIST xfsprogs-6.17.0.tar.xz 1563092 BLAKE2B e841526add6c17d036a709c1fafe879a50ba7d568008865eac8d166182be5514d8abc94b8facbe113aa6106ac394ea01049b6a555ebd280ee1cd5d64fff1b5da SHA512 bcdd5a632ac1eae4ad68ac1b18a0289820fcef997da2b3b132e97f035f21e951f20f19de9d09e0babd7d7feb8ad14c0782aa81c698b39c19e4349e603892287e
|
||||
DIST xfsprogs-6.18.0.tar.xz 1563944 BLAKE2B 225cb49a39a2539e48513985d72602c0c067f73597e3fe1d9d4062989ed98c3a0b2c85bb9d465c60acefce3243a7e2320808727e6ce527fbc35216bde235144e SHA512 95fcbfdd91d9b02ec9adef50e23a39240056bf3bfed3d973e048a50dd0d0b040f80e8cf72537cca7e560718e4444ed1bbcf8b99ee4c82e044ca52d916536f7f5
|
||||
|
||||
@ -1,44 +0,0 @@
|
||||
https://lore.kernel.org/linux-xfs/20250221185757.79333-1-preichl@redhat.com/
|
||||
|
||||
From: Pavel Reichl <preichl@redhat.com>
|
||||
To: aalbersh@redhat.com
|
||||
Cc: linux-xfs@vger.kernel.org
|
||||
Subject: [PATCH v2] xfsprogs: Fix mismatched return type of filesize()
|
||||
Date: Fri, 21 Feb 2025 19:57:57 +0100
|
||||
Message-ID: <20250221185757.79333-1-preichl@redhat.com>
|
||||
X-Mailer: git-send-email 2.48.1
|
||||
In-Reply-To: <20250217155043.78452-1-preichl@redhat.com>
|
||||
References: <20250217155043.78452-1-preichl@redhat.com>
|
||||
Precedence: bulk
|
||||
X-Mailing-List: linux-xfs@vger.kernel.org
|
||||
List-Id: <linux-xfs.vger.kernel.org>
|
||||
List-Subscribe: <mailto:linux-xfs+subscribe@vger.kernel.org>
|
||||
List-Unsubscribe: <mailto:linux-xfs+unsubscribe@vger.kernel.org>
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
The function filesize() was declared with a return type of 'long' but
|
||||
defined with 'off_t'. This mismatch caused build issues due to type
|
||||
incompatibility.
|
||||
|
||||
This commit updates the declaration to match the definition, ensuring
|
||||
consistency and preventing potential compilation errors.
|
||||
|
||||
Fixes: 73fb78e5ee8 ("mkfs: support copying in large or sparse files")
|
||||
|
||||
Signed-off-by: Pavel Reichl <preichl@redhat.com>
|
||||
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
|
||||
Reviewed-by: Carlos Maiolino <cem@kernel.org>
|
||||
--- a/mkfs/proto.c
|
||||
+++ b/mkfs/proto.c
|
||||
@@ -20,7 +20,7 @@ static struct xfs_trans * getres(struct xfs_mount *mp, uint blocks);
|
||||
static void rsvfile(xfs_mount_t *mp, xfs_inode_t *ip, long long len);
|
||||
static int newregfile(char **pp, char **fname);
|
||||
static void rtinit(xfs_mount_t *mp);
|
||||
-static long filesize(int fd);
|
||||
+static off_t filesize(int fd);
|
||||
static int slashes_are_spaces;
|
||||
|
||||
/*
|
||||
--
|
||||
2.48.1
|
||||
@ -1,113 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit flag-o-matic systemd udev
|
||||
|
||||
DESCRIPTION="XFS filesystem utilities"
|
||||
HOMEPAGE="https://xfs.wiki.kernel.org/ https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/"
|
||||
SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
|
||||
IUSE="icu libedit nls selinux static-libs"
|
||||
|
||||
RDEPEND="
|
||||
dev-libs/inih
|
||||
dev-libs/userspace-rcu:=
|
||||
>=sys-apps/util-linux-2.17.2
|
||||
icu? ( dev-libs/icu:= )
|
||||
libedit? ( dev-libs/libedit )
|
||||
"
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
>=sys-kernel/linux-headers-6.11
|
||||
"
|
||||
BDEPEND="nls? ( sys-devel/gettext )"
|
||||
RDEPEND+=" selinux? ( sec-policy/selinux-xfs )"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# Fix doc dir
|
||||
sed -i \
|
||||
-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
|
||||
include/builddefs.in || die
|
||||
|
||||
# Don't install compressed docs
|
||||
sed 's@\(CHANGES\)\.gz[[:space:]]@\1 @' -i doc/Makefile || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# include/builddefs.in will add FCFLAGS to CFLAGS which will
|
||||
# unnecessarily clutter CFLAGS (and fortran isn't used)
|
||||
unset FCFLAGS
|
||||
|
||||
# If set in user env, this breaks configure
|
||||
unset PLATFORM
|
||||
|
||||
export DEBUG=-DNDEBUG
|
||||
|
||||
# Package is honoring CFLAGS; No need to use OPTIMIZER anymore.
|
||||
# However, we have to provide an empty value to avoid default
|
||||
# flags.
|
||||
export OPTIMIZER=" "
|
||||
|
||||
# Avoid automagic on libdevmapper (bug #709694)
|
||||
export ac_cv_search_dm_task_create=no
|
||||
|
||||
# bug 903611, 948468
|
||||
use elibc_musl && \
|
||||
append-flags -D_LARGEFILE64_SOURCE -DOVERRIDE_SYSTEM_STATX
|
||||
|
||||
# Upstream does NOT support --disable-static anymore,
|
||||
# https://www.spinics.net/lists/linux-xfs/msg30185.html
|
||||
# https://www.spinics.net/lists/linux-xfs/msg30272.html
|
||||
local myconf=(
|
||||
--enable-static
|
||||
# Doesn't do anything beyond adding -flto (bug #930947).
|
||||
--disable-lto
|
||||
# The default value causes double 'lib'
|
||||
--localstatedir="${EPREFIX}/var"
|
||||
--with-crond-dir="${EPREFIX}/etc/cron.d"
|
||||
--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
|
||||
--with-udev-rule-dir="$(get_udevdir)/rules.d"
|
||||
$(use_enable icu libicu)
|
||||
$(use_enable nls gettext)
|
||||
$(use_enable libedit editline)
|
||||
)
|
||||
|
||||
econf "${myconf[@]}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# -j1 for:
|
||||
# gmake[2]: *** No rule to make target '../libhandle/libhandle.la', needed by 'xfs_spaceman'. Stop.
|
||||
emake V=1 -j1
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# XXX: There's a missing dep in the install-dev target, so split it
|
||||
emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install
|
||||
emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install-dev
|
||||
|
||||
# Not actually used but --localstatedir causes this empty dir
|
||||
# to be installed.
|
||||
rmdir "${ED}"/var/lib/xfsprogs "${ED}"/var/lib || die
|
||||
|
||||
if ! use static-libs; then
|
||||
rm "${ED}/usr/$(get_libdir)/libhandle.a" || die
|
||||
fi
|
||||
|
||||
find "${ED}" -name '*.la' -delete || die
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
udev_reload
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
udev_reload
|
||||
}
|
||||
@ -1,117 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit flag-o-matic systemd udev
|
||||
|
||||
DESCRIPTION="XFS filesystem utilities"
|
||||
HOMEPAGE="https://xfs.wiki.kernel.org/ https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/"
|
||||
SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
|
||||
IUSE="icu libedit nls selinux static-libs"
|
||||
|
||||
RDEPEND="
|
||||
dev-libs/inih
|
||||
dev-libs/userspace-rcu:=
|
||||
>=sys-apps/util-linux-2.17.2
|
||||
icu? ( dev-libs/icu:= )
|
||||
libedit? ( dev-libs/libedit )
|
||||
"
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
>=sys-kernel/linux-headers-6.11
|
||||
"
|
||||
BDEPEND="nls? ( sys-devel/gettext )"
|
||||
RDEPEND+=" selinux? ( sec-policy/selinux-xfs )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-6.13.0-32-bit.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# Fix doc dir
|
||||
sed -i \
|
||||
-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
|
||||
include/builddefs.in || die
|
||||
|
||||
# Don't install compressed docs
|
||||
sed 's@\(CHANGES\)\.gz[[:space:]]@\1 @' -i doc/Makefile || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# include/builddefs.in will add FCFLAGS to CFLAGS which will
|
||||
# unnecessarily clutter CFLAGS (and fortran isn't used)
|
||||
unset FCFLAGS
|
||||
|
||||
# If set in user env, this breaks configure
|
||||
unset PLATFORM
|
||||
|
||||
export DEBUG=-DNDEBUG
|
||||
|
||||
# Package is honoring CFLAGS; No need to use OPTIMIZER anymore.
|
||||
# However, we have to provide an empty value to avoid default
|
||||
# flags.
|
||||
export OPTIMIZER=" "
|
||||
|
||||
# Avoid automagic on libdevmapper (bug #709694)
|
||||
export ac_cv_search_dm_task_create=no
|
||||
|
||||
# bug 903611, 948468
|
||||
use elibc_musl && \
|
||||
append-flags -D_LARGEFILE64_SOURCE -DOVERRIDE_SYSTEM_STATX
|
||||
|
||||
# Upstream does NOT support --disable-static anymore,
|
||||
# https://www.spinics.net/lists/linux-xfs/msg30185.html
|
||||
# https://www.spinics.net/lists/linux-xfs/msg30272.html
|
||||
local myconf=(
|
||||
--enable-static
|
||||
# Doesn't do anything beyond adding -flto (bug #930947).
|
||||
--disable-lto
|
||||
# The default value causes double 'lib'
|
||||
--localstatedir="${EPREFIX}/var"
|
||||
--with-crond-dir="${EPREFIX}/etc/cron.d"
|
||||
--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
|
||||
--with-udev-rule-dir="$(get_udevdir)/rules.d"
|
||||
$(use_enable icu libicu)
|
||||
$(use_enable nls gettext)
|
||||
$(use_enable libedit editline)
|
||||
)
|
||||
|
||||
econf "${myconf[@]}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# -j1 for:
|
||||
# gmake[2]: *** No rule to make target '../libhandle/libhandle.la', needed by 'xfs_spaceman'. Stop.
|
||||
emake V=1 -j1
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# XXX: There's a missing dep in the install-dev target, so split it
|
||||
emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install
|
||||
emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install-dev
|
||||
|
||||
# Not actually used but --localstatedir causes this empty dir
|
||||
# to be installed.
|
||||
rmdir "${ED}"/var/lib/xfsprogs "${ED}"/var/lib || die
|
||||
|
||||
if ! use static-libs; then
|
||||
rm "${ED}/usr/$(get_libdir)/libhandle.a" || die
|
||||
fi
|
||||
|
||||
find "${ED}" -name '*.la' -delete || die
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
udev_reload
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
udev_reload
|
||||
}
|
||||
@ -1,113 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit flag-o-matic systemd udev
|
||||
|
||||
DESCRIPTION="XFS filesystem utilities"
|
||||
HOMEPAGE="https://xfs.wiki.kernel.org/ https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/"
|
||||
SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
|
||||
IUSE="icu libedit nls selinux static-libs"
|
||||
|
||||
RDEPEND="
|
||||
dev-libs/inih
|
||||
dev-libs/userspace-rcu:=
|
||||
>=sys-apps/util-linux-2.17.2
|
||||
icu? ( dev-libs/icu:= )
|
||||
libedit? ( dev-libs/libedit )
|
||||
"
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
>=sys-kernel/linux-headers-6.11
|
||||
"
|
||||
BDEPEND="nls? ( sys-devel/gettext )"
|
||||
RDEPEND+=" selinux? ( sec-policy/selinux-xfs )"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# Fix doc dir
|
||||
sed -i \
|
||||
-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
|
||||
include/builddefs.in || die
|
||||
|
||||
# Don't install compressed docs
|
||||
sed 's@\(CHANGES\)\.gz[[:space:]]@\1 @' -i doc/Makefile || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# include/builddefs.in will add FCFLAGS to CFLAGS which will
|
||||
# unnecessarily clutter CFLAGS (and fortran isn't used)
|
||||
unset FCFLAGS
|
||||
|
||||
# If set in user env, this breaks configure
|
||||
unset PLATFORM
|
||||
|
||||
export DEBUG=-DNDEBUG
|
||||
|
||||
# Package is honoring CFLAGS; No need to use OPTIMIZER anymore.
|
||||
# However, we have to provide an empty value to avoid default
|
||||
# flags.
|
||||
export OPTIMIZER=" "
|
||||
|
||||
# Avoid automagic on libdevmapper (bug #709694)
|
||||
export ac_cv_search_dm_task_create=no
|
||||
|
||||
# bug 903611, 948468
|
||||
use elibc_musl && \
|
||||
append-flags -D_LARGEFILE64_SOURCE -DOVERRIDE_SYSTEM_STATX
|
||||
|
||||
# Upstream does NOT support --disable-static anymore,
|
||||
# https://www.spinics.net/lists/linux-xfs/msg30185.html
|
||||
# https://www.spinics.net/lists/linux-xfs/msg30272.html
|
||||
local myconf=(
|
||||
--enable-static
|
||||
# Doesn't do anything beyond adding -flto (bug #930947).
|
||||
--disable-lto
|
||||
# The default value causes double 'lib'
|
||||
--localstatedir="${EPREFIX}/var"
|
||||
--with-crond-dir="${EPREFIX}/etc/cron.d"
|
||||
--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
|
||||
--with-udev-rule-dir="$(get_udevdir)/rules.d"
|
||||
$(use_enable icu libicu)
|
||||
$(use_enable nls gettext)
|
||||
$(use_enable libedit editline)
|
||||
)
|
||||
|
||||
econf "${myconf[@]}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# -j1 for:
|
||||
# gmake[2]: *** No rule to make target '../libhandle/libhandle.la', needed by 'xfs_spaceman'. Stop.
|
||||
emake V=1 -j1
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# XXX: There's a missing dep in the install-dev target, so split it
|
||||
emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install
|
||||
emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install-dev
|
||||
|
||||
# Not actually used but --localstatedir causes this empty dir
|
||||
# to be installed.
|
||||
rmdir "${ED}"/var/lib/xfsprogs "${ED}"/var/lib || die
|
||||
|
||||
if ! use static-libs; then
|
||||
rm "${ED}/usr/$(get_libdir)/libhandle.a" || die
|
||||
fi
|
||||
|
||||
find "${ED}" -name '*.la' -delete || die
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
udev_reload
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
udev_reload
|
||||
}
|
||||
@ -1,114 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit flag-o-matic systemd udev
|
||||
|
||||
DESCRIPTION="XFS filesystem utilities"
|
||||
HOMEPAGE="https://xfs.wiki.kernel.org/ https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/"
|
||||
SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
|
||||
IUSE="icu libedit nls selinux static-libs"
|
||||
|
||||
RDEPEND="
|
||||
dev-libs/inih
|
||||
dev-libs/userspace-rcu:=
|
||||
>=sys-apps/util-linux-2.17.2
|
||||
icu? ( dev-libs/icu:= )
|
||||
libedit? ( dev-libs/libedit )
|
||||
"
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
>=sys-kernel/linux-headers-6.11
|
||||
"
|
||||
BDEPEND="nls? ( sys-devel/gettext )"
|
||||
RDEPEND+=" selinux? ( sec-policy/selinux-xfs )"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# Fix doc dir
|
||||
sed -i \
|
||||
-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
|
||||
include/builddefs.in || die
|
||||
|
||||
# Don't install compressed docs
|
||||
sed 's@\(CHANGES\)\.gz[[:space:]]@\1 @' -i doc/Makefile || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# include/builddefs.in will add FCFLAGS to CFLAGS which will
|
||||
# unnecessarily clutter CFLAGS (and fortran isn't used)
|
||||
unset FCFLAGS
|
||||
|
||||
# If set in user env, this breaks configure
|
||||
unset PLATFORM
|
||||
|
||||
export DEBUG=-DNDEBUG
|
||||
|
||||
# Package is honoring CFLAGS; No need to use OPTIMIZER anymore.
|
||||
# However, we have to provide an empty value to avoid default
|
||||
# flags.
|
||||
export OPTIMIZER=" "
|
||||
|
||||
# Avoid automagic on libdevmapper (bug #709694)
|
||||
export ac_cv_search_dm_task_create=no
|
||||
|
||||
# bug 903611, 948468, 960632
|
||||
use elibc_musl && \
|
||||
append-flags -D_LARGEFILE64_SOURCE -DOVERRIDE_SYSTEM_STATX \
|
||||
-DSTATX__RESERVED=0x80000000U
|
||||
|
||||
# Upstream does NOT support --disable-static anymore,
|
||||
# https://www.spinics.net/lists/linux-xfs/msg30185.html
|
||||
# https://www.spinics.net/lists/linux-xfs/msg30272.html
|
||||
local myconf=(
|
||||
--enable-static
|
||||
# Doesn't do anything beyond adding -flto (bug #930947).
|
||||
--disable-lto
|
||||
# The default value causes double 'lib'
|
||||
--localstatedir="${EPREFIX}/var"
|
||||
--with-crond-dir="${EPREFIX}/etc/cron.d"
|
||||
--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
|
||||
--with-udev-rule-dir="$(get_udevdir)/rules.d"
|
||||
$(use_enable icu libicu)
|
||||
$(use_enable nls gettext)
|
||||
$(use_enable libedit editline)
|
||||
)
|
||||
|
||||
econf "${myconf[@]}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# -j1 for:
|
||||
# gmake[2]: *** No rule to make target '../libhandle/libhandle.la', needed by 'xfs_spaceman'. Stop.
|
||||
emake V=1 -j1
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# XXX: There's a missing dep in the install-dev target, so split it
|
||||
emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install
|
||||
emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install-dev
|
||||
|
||||
# Not actually used but --localstatedir causes this empty dir
|
||||
# to be installed.
|
||||
rmdir "${ED}"/var/lib/xfsprogs "${ED}"/var/lib || die
|
||||
|
||||
if ! use static-libs; then
|
||||
rm "${ED}/usr/$(get_libdir)/libhandle.a" || die
|
||||
fi
|
||||
|
||||
find "${ED}" -name '*.la' -delete || die
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
udev_reload
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
udev_reload
|
||||
}
|
||||
@ -1,112 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit flag-o-matic systemd udev
|
||||
|
||||
DESCRIPTION="XFS filesystem utilities"
|
||||
HOMEPAGE="https://xfs.wiki.kernel.org/ https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/"
|
||||
SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
|
||||
IUSE="icu libedit nls selinux static-libs"
|
||||
|
||||
RDEPEND="
|
||||
dev-libs/inih
|
||||
dev-libs/userspace-rcu:=
|
||||
>=sys-apps/util-linux-2.17.2
|
||||
icu? ( dev-libs/icu:= )
|
||||
libedit? ( dev-libs/libedit )
|
||||
"
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
>=sys-kernel/linux-headers-6.11
|
||||
"
|
||||
BDEPEND="nls? ( sys-devel/gettext )"
|
||||
RDEPEND+=" selinux? ( sec-policy/selinux-xfs )"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# Fix doc dir
|
||||
sed -i \
|
||||
-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
|
||||
include/builddefs.in || die
|
||||
|
||||
# Don't install compressed docs
|
||||
sed 's@\(CHANGES\)\.gz[[:space:]]@\1 @' -i doc/Makefile || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# include/builddefs.in will add FCFLAGS to CFLAGS which will
|
||||
# unnecessarily clutter CFLAGS (and fortran isn't used)
|
||||
unset FCFLAGS
|
||||
|
||||
# If set in user env, this breaks configure
|
||||
unset PLATFORM
|
||||
|
||||
export DEBUG=-DNDEBUG
|
||||
|
||||
# Package is honoring CFLAGS; No need to use OPTIMIZER anymore.
|
||||
# However, we have to provide an empty value to avoid default
|
||||
# flags.
|
||||
export OPTIMIZER=" "
|
||||
|
||||
# Avoid automagic on libdevmapper (bug #709694)
|
||||
export ac_cv_search_dm_task_create=no
|
||||
|
||||
# bug 903611, 948468, 960632
|
||||
use elibc_musl && \
|
||||
append-flags -D_LARGEFILE64_SOURCE -DOVERRIDE_SYSTEM_STATX \
|
||||
-DSTATX__RESERVED=0x80000000U
|
||||
|
||||
# Upstream does NOT support --disable-static anymore,
|
||||
# https://www.spinics.net/lists/linux-xfs/msg30185.html
|
||||
# https://www.spinics.net/lists/linux-xfs/msg30272.html
|
||||
local myconf=(
|
||||
--enable-static
|
||||
# Doesn't do anything beyond adding -flto (bug #930947).
|
||||
--disable-lto
|
||||
# The default value causes double 'lib'
|
||||
--localstatedir="${EPREFIX}/var"
|
||||
--with-crond-dir="${EPREFIX}/etc/cron.d"
|
||||
--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
|
||||
--with-udev-rule-dir="$(get_udevdir)/rules.d"
|
||||
$(use_enable icu libicu)
|
||||
$(use_enable nls gettext)
|
||||
$(use_enable libedit editline)
|
||||
)
|
||||
|
||||
econf "${myconf[@]}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake V=1
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# XXX: There's a missing dep in the install-dev target, so split it
|
||||
emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install
|
||||
emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install-dev
|
||||
|
||||
# Not actually used but --localstatedir causes this empty dir
|
||||
# to be installed.
|
||||
rmdir "${ED}"/var/lib/xfsprogs "${ED}"/var/lib || die
|
||||
|
||||
if ! use static-libs; then
|
||||
rm "${ED}/usr/$(get_libdir)/libhandle.a" || die
|
||||
fi
|
||||
|
||||
find "${ED}" -name '*.la' -delete || die
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
udev_reload
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
udev_reload
|
||||
}
|
||||
@ -1,110 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit flag-o-matic systemd udev
|
||||
|
||||
DESCRIPTION="XFS filesystem utilities"
|
||||
HOMEPAGE="https://xfs.wiki.kernel.org/ https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/"
|
||||
SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
|
||||
IUSE="icu libedit nls selinux static-libs"
|
||||
|
||||
RDEPEND="
|
||||
dev-libs/inih
|
||||
dev-libs/userspace-rcu:=
|
||||
>=sys-apps/util-linux-2.17.2
|
||||
icu? ( dev-libs/icu:= )
|
||||
libedit? ( dev-libs/libedit )
|
||||
"
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
>=sys-kernel/linux-headers-6.11
|
||||
"
|
||||
BDEPEND="nls? ( sys-devel/gettext )"
|
||||
RDEPEND+=" selinux? ( sec-policy/selinux-xfs )"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# Fix doc dir
|
||||
sed -i \
|
||||
-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
|
||||
include/builddefs.in || die
|
||||
|
||||
# Don't install compressed docs
|
||||
sed 's@\(CHANGES\)\.gz[[:space:]]@\1 @' -i doc/Makefile || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# include/builddefs.in will add FCFLAGS to CFLAGS which will
|
||||
# unnecessarily clutter CFLAGS (and fortran isn't used)
|
||||
unset FCFLAGS
|
||||
|
||||
# If set in user env, this breaks configure
|
||||
unset PLATFORM
|
||||
|
||||
export DEBUG=-DNDEBUG
|
||||
|
||||
# Package is honoring CFLAGS; No need to use OPTIMIZER anymore.
|
||||
# However, we have to provide an empty value to avoid default
|
||||
# flags.
|
||||
export OPTIMIZER=" "
|
||||
|
||||
# Avoid automagic on libdevmapper (bug #709694)
|
||||
export ac_cv_search_dm_task_create=no
|
||||
|
||||
# bug 903611
|
||||
use elibc_musl && append-flags -D_LARGEFILE64_SOURCE
|
||||
|
||||
# Upstream does NOT support --disable-static anymore,
|
||||
# https://www.spinics.net/lists/linux-xfs/msg30185.html
|
||||
# https://www.spinics.net/lists/linux-xfs/msg30272.html
|
||||
local myconf=(
|
||||
--enable-static
|
||||
# Doesn't do anything beyond adding -flto (bug #930947).
|
||||
--disable-lto
|
||||
# The default value causes double 'lib'
|
||||
--localstatedir="${EPREFIX}/var"
|
||||
--with-crond-dir="${EPREFIX}/etc/cron.d"
|
||||
--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
|
||||
--with-udev-rule-dir="$(get_udevdir)/rules.d"
|
||||
$(use_enable icu libicu)
|
||||
$(use_enable nls gettext)
|
||||
$(use_enable libedit editline)
|
||||
)
|
||||
|
||||
econf "${myconf[@]}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake V=1
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# XXX: There's a missing dep in the install-dev target, so split it
|
||||
emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install
|
||||
emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install-dev
|
||||
|
||||
# Not actually used but --localstatedir causes this empty dir
|
||||
# to be installed.
|
||||
rmdir "${ED}"/var/lib/xfsprogs "${ED}"/var/lib || die
|
||||
|
||||
if ! use static-libs; then
|
||||
rm "${ED}/usr/$(get_libdir)/libhandle.a" || die
|
||||
fi
|
||||
|
||||
find "${ED}" -name '*.la' -delete || die
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
udev_reload
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
udev_reload
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Copyright 1999-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
|
||||
IUSE="icu libedit nls selinux static-libs"
|
||||
|
||||
RDEPEND="
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user