mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-28 17:11:34 +02:00
sys-fs/xfsprogs: Sync with Gentoo
It's from Gentoo commit e592ca40fd7c5e7031b83319f3860209a9e3ff5f.
This commit is contained in:
Flatcar Buildbot
Krzesimir Nowak
parent
dcdfea2012
commit
bbbd4aed5c
@ -1,6 +1,5 @@
|
||||
DIST xfsprogs-6.10.0.tar.xz 1449872 BLAKE2B dc02fb14cd07e20d618070358700003a0990125ce3d8b15fa0248c6d494a89bbfb51c267583fc863edeee0d84069c7016f7992e750faa357618cd0d7f5748d2e SHA512 ec80eedfd3471c836e99eb8507c0de2895f261d36316145b02f2effbcc1bb5a52eae3ad2148d45bc49f1a30e0267aa4e3f3176a5e01ec84b2da24b3fb430ffce
|
||||
DIST xfsprogs-6.10.1.tar.xz 1449932 BLAKE2B e9ed15b2d4a9026e0079adfb38578721e13498290a5d9590edae1fd41c9ee0338f9b823568677394952709d82bdc8ade36905a2266ffe64803901adbadfa5643 SHA512 b9fd7b7eaf038772ee4a9602bf38f714db7077731ec8904e0959d28b0103d443be8ae67720869012b90737c1ff440fbce44b3b23b662939c9a90c6d3be3fab08
|
||||
DIST xfsprogs-6.11.0.tar.xz 1457084 BLAKE2B 846b25ad36477d71f8f2091ad16699356416f09befbb4250335081d2a8fd78011e9100fbabfb727acdb65520a38c912d9bb9e33b17c222c97de88fd00ab004a9 SHA512 209b479e510e5d5c558430b523bebd90f34b2effeac46f783aad4ec45a9f39998ca1efc67155c54c22e778859968f4b275b0ca6f225603f17ae4cc5c7596a4ca
|
||||
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.8.0.tar.xz 1367196 BLAKE2B 8c296698da1170bb7ff369c2bf5f156e812ddf43ee817369029ad951d6c1e18c20d093db385b9a523f6cb7ba3e01f8924eb3540b71efa4bec8bf3defe2418562 SHA512 f5b5c6d8da70cc0f3361b3420982aabfabb0bc54b9eb60b93a9aaeedb33a9ecede4061d5c1300b96d7aba7d44a4207672c4a33e115bf0f5c711a151f3fc65e0d
|
||||
DIST xfsprogs-6.9.0.tar.xz 1383116 BLAKE2B d952603716cc4022a935c426630b0b7838573476a730c6832f36ef0274a640e64667d3e3a2dd9fd2c5f2c12cdb348fd93abfef5c49e5c5fe2d5a83945dfc7894 SHA512 c597453759c400690810971f0b2daf0e4e22c74270b0f9800e2235da5e5c1383b59bc1176c5bba0023f74b623020fb51c62f0e98a74885cf3a8336e0b81c9023
|
||||
|
||||
@ -1,46 +0,0 @@
|
||||
https://bugs.gentoo.org/938569
|
||||
https://lore.kernel.org/linux-xfs/172480131521.2291268.17945339760767205637.stgit@frogsfrogsfrogs/
|
||||
|
||||
From fd885ea4d54be6e98df7342bd99b77bc8cbd64d5 Mon Sep 17 00:00:00 2001
|
||||
Message-ID: <fd885ea4d54be6e98df7342bd99b77bc8cbd64d5.1724802060.git.sam@gentoo.org>
|
||||
From: "Darrick J. Wong" <djwong@kernel.org>
|
||||
Date: Tue, 27 Aug 2024 16:33:58 -0700
|
||||
Subject: [PATCH] xfs: fix C++ compilation errors in xfs_fs.h
|
||||
|
||||
Several people reported C++ compilation errors due to things that C
|
||||
compilers allow but C++ compilers do not. Fix both of these problems,
|
||||
and hope there aren't more of these brown paper bags in 2 months when we
|
||||
finally get these fixes through the process into a released xfsprogs.
|
||||
|
||||
Reported-by: kernel@mattwhitlock.name
|
||||
Reported-by: sam@gentoo.org
|
||||
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=219203
|
||||
Fixes: 233f4e12bbb2c ("xfs: add parent pointer ioctls")
|
||||
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
|
||||
---
|
||||
libxfs/xfs_fs.h | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/libxfs/xfs_fs.h b/libxfs/xfs_fs.h
|
||||
index 454b63ef..2b8e1f4f 100644
|
||||
--- a/libxfs/xfs_fs.h
|
||||
+++ b/libxfs/xfs_fs.h
|
||||
@@ -906,13 +906,13 @@ static inline struct xfs_getparents_rec *
|
||||
xfs_getparents_next_rec(struct xfs_getparents *gp,
|
||||
struct xfs_getparents_rec *gpr)
|
||||
{
|
||||
- void *next = ((void *)gpr + gpr->gpr_reclen);
|
||||
+ void *next = ((char *)gpr + gpr->gpr_reclen);
|
||||
void *end = (void *)(uintptr_t)(gp->gp_buffer + gp->gp_bufsize);
|
||||
|
||||
if (next >= end)
|
||||
return NULL;
|
||||
|
||||
- return next;
|
||||
+ return (struct xfs_getparents_rec *)next;
|
||||
}
|
||||
|
||||
/* Iterate through this file handle's directory parent pointers. */
|
||||
--
|
||||
2.46.0
|
||||
|
||||
44
sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/files/xfsprogs-6.13.0-32-bit.patch
vendored
Normal file
44
sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/files/xfsprogs-6.13.0-32-bit.patch
vendored
Normal file
@ -0,0 +1,44 @@
|
||||
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,4 +1,4 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
@ -21,12 +21,15 @@ RDEPEND="
|
||||
icu? ( dev-libs/icu:= )
|
||||
libedit? ( dev-libs/libedit )
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
>=sys-kernel/linux-headers-6.11
|
||||
"
|
||||
BDEPEND="nls? ( sys-devel/gettext )"
|
||||
RDEPEND+=" selinux? ( sec-policy/selinux-xfs )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-6.10.0-c++-void.patch
|
||||
"${FILESDIR}"/${PN}-6.13.0-32-bit.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
@ -86,7 +89,9 @@ src_configure() {
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake V=1
|
||||
# -j1 for:
|
||||
# gmake[2]: *** No rule to make target '../libhandle/libhandle.la', needed by 'xfs_spaceman'. Stop.
|
||||
emake V=1 -j1
|
||||
}
|
||||
|
||||
src_install() {
|
||||
@ -1,106 +0,0 @@
|
||||
# Copyright 1999-2024 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}"
|
||||
BDEPEND="nls? ( sys-devel/gettext )"
|
||||
RDEPEND+=" selinux? ( sec-policy/selinux-xfs )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-5.3.0-libdir.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
|
||||
use elibc_musl && append-flags -D_LARGEFILE64_SOURCE
|
||||
|
||||
# Build fails with -O3 (bug #712698)
|
||||
replace-flags -O3 -O2
|
||||
|
||||
# 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
|
||||
--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
|
||||
|
||||
if ! use static-libs; then
|
||||
rm "${ED}/usr/$(get_libdir)/libhandle.a" || die
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
udev_reload
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
udev_reload
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user