mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-24 07:01:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

sys-fs/xfsprogs: Sync with Gentoo

Browse Source 
It's from Gentoo commit ba051a0646afa395f8891d8898aaa99981e840fa.
This commit is contained in:
Krzesimir Nowak 2023-07-28 12:53:58 +02:00
parent f8f35bee07
commit f16b7f067e
6 changed files with 49 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/Manifest vendored
View File

@ -1,3 +1,2 @@
DIST xfsprogs-5.10.0.tar.xz 1273332 BLAKE2B 8caaa0ca8a94480f131d36b383afcf732b3a5a7a3c7927b4b4da4855fc5a0fb97a56fcebb98391a4dd0f02465868a4bd857e57eeba053a419df47d42f74bc958 SHA512 da09e687c87c4b133888dba7b4458017ec028020637ea5066be0232bf5c7da18239cc33eadd02d9b99d1c835aab38cab1ec9d45ae8b83897f9157cfcb0271fbd DIST xfsprogs-6.3.0.tar.xz 1328452 BLAKE2B 47a4ec45c88f26b32debd52283602d8244f996c071853b6bf7cf905f917436b1324bc9b58338346c8255201629d69e771d6c3bfd81f33f4f3c3907251d0a6c8c SHA512 dbb3e77d0d9cf184a0e647b8231350401a7549a23a0bfd9121cf2a1b48e85f71d98329dff440fc6e984bcecfdcc2a72f0f27c4989560f3c55359f21f3fb434bb
DIST xfsprogs-5.14.1.tar.xz 1308968 BLAKE2B fda20f824a030113717cc46de1920696dc8f9eed13b54809e6b21275cf4f8673385e8bbb1c1c668ba2592ab43fb230c9d46edf4c0e5abe59a9572cc9a90ae5da SHA512 5bb79fff45048bebee2fde85ec788658dd8dc8d5ddac222b1f74c6cd525e1239d920814e8e713f045e38398a785321bf0a7421ff1c690cd0be5dbb224f8dafea DIST xfsprogs-6.4.0.tar.xz 1344720 BLAKE2B 566a80a1fa90520c6cc2b20c8e8cde41eb83a48f0b6d4a978f9e5d43960e99b54cab3e0c2cd4147a3d8f4944e50876063fc571441c8239d6deaaa01604843a6b SHA512 831e7747640bc2964b182226d8bb6f637610b123aeec9b3cb97a5de5d5b65bde30c6b40ad2e78de6a5214e823dd75de3a2bdfddd8ab1638f5c7340a760c91b3f
DIST xfsprogs-5.14.2.tar.xz 1308912 BLAKE2B 04083bf7952015d64f16e1aec0fa74be1957543e2264914f69defe45a3dc9f2524d941abc064a25a2fd760ebd6dcdcdc2404fd305e08fff7f6be6c5fc11d4d2f SHA512 cb9794247a2eed8bd9f10ff811d38f97e4adbed97bad334b0fa8a26503ec224237eddd92fd78892584a153967417ab2009fb2fc8bab6ef12cd53fd20bdba1b4e

6
sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/files/xfsprogs-4.15.0-docdir.patch → sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/files/xfsprogs-5.18.0-docdir.patch vendored
View File

@ -1,10 +1,10 @@
--- xfsprogs-4.15.0/scrub/Makefile --- a/scrub/Makefile
+++ xfsprogs-4.15.0/scrub/Makefile +++ b/scrub/Makefile
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
CRONTABS = xfs_scrub_all.cron CRONTABS = xfs_scrub_all.cron
OPTIONAL_TARGETS += $(CRONTABS) OPTIONAL_TARGETS += $(CRONTABS)
# Don't enable the crontab by default for now # Don't enable the crontab by default for now
-CROND_DIR = $(PKG_LIB_DIR)/$(PKG_NAME) -CROND_DIR = $(PKG_LIB_SCRIPT_DIR)/$(PKG_NAME)
+CROND_DIR = $(PKG_DOC_DIR) +CROND_DIR = $(PKG_DOC_DIR)
endif endif

12
sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/files/xfsprogs-6.3.0-gettext-0.22.patch vendored Normal file
View File

@ -0,0 +1,12 @@
https://lore.kernel.org/linux-xfs/20230626095048.1290476-1-sam@gentoo.org/T/#u
--- a/po/de.po
+++ b/po/de.po
@@ -3084,7 +3084,7 @@
#: .././estimate/xfs_estimate.c:191
#, c-format
msgid "%s will take about %.1f megabytes\n"
-msgstr "%s wird etwa %.lf Megabytes einnehmen\n"
+msgstr "%s wird etwa %.1f Megabytes einnehmen\n"
#: .././estimate/xfs_estimate.c:198
#, c-format

95
sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-5.10.0-r1.ebuild vendored
View File

@ -1,95 +0,0 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit flag-o-matic toolchain-funcs systemd usr-ldscript
DESCRIPTION="xfs filesystem utilities"
HOMEPAGE="https://xfs.wiki.kernel.org/"
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 ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="icu libedit nls selinux"
RDEPEND=">=sys-apps/util-linux-2.17.2
dev-libs/inih
icu? ( dev-libs/icu:= )
libedit? ( dev-libs/libedit )
"
DEPEND="${RDEPEND}"
BDEPEND="
nls? ( sys-devel/gettext )
"
RDEPEND+=" selinux? ( sec-policy/selinux-xfs )"
PATCHES=(
"${FILESDIR}"/${PN}-4.15.0-docdir.patch
"${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
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=" "
unset PLATFORM # if set in user env, this breaks configure
# Avoid automagic on libdevmapper, #709694
export ac_cv_search_dm_task_create=no
# 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-blkid
--with-crond-dir="${EPREFIX}/etc/cron.d"
--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
$(use_enable icu libicu)
$(use_enable nls gettext)
$(use_enable libedit editline)
)
if is-flagq -flto ; then
myconf+=( --enable-lto )
else
myconf+=( --disable-lto )
fi
econf "${myconf[@]}"
}
src_compile() {
emake V=1
}
src_install() {
emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install
emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install-dev
gen_usr_ldscript -a handle
}

34
sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-5.14.2.ebuild → sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-6.3.0.ebuild vendored
View File

@ -1,34 +1,32 @@
# Copyright 1999-2021 Gentoo Authors # Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=7 EAPI=8
inherit flag-o-matic systemd usr-ldscript inherit flag-o-matic systemd usr-ldscript
DESCRIPTION="xfs filesystem utilities" DESCRIPTION="XFS filesystem utilities"
HOMEPAGE="https://xfs.wiki.kernel.org/" 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" SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
LICENSE="LGPL-2.1" LICENSE="LGPL-2.1"
SLOT="0" SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="icu libedit nls selinux" IUSE="icu libedit nls selinux"
RDEPEND=">=sys-apps/util-linux-2.17.2 RDEPEND="dev-libs/inih
dev-libs/inih dev-libs/userspace-rcu:=
dev-libs/userspace-rcu >=sys-apps/util-linux-2.17.2
icu? ( dev-libs/icu:= ) icu? ( dev-libs/icu:= )
libedit? ( dev-libs/libedit ) libedit? ( dev-libs/libedit )"
"
DEPEND="${RDEPEND}" DEPEND="${RDEPEND}"
BDEPEND=" BDEPEND="nls? ( sys-devel/gettext )"
nls? ( sys-devel/gettext )
"
RDEPEND+=" selinux? ( sec-policy/selinux-xfs )" RDEPEND+=" selinux? ( sec-policy/selinux-xfs )"
PATCHES=( PATCHES=(
"${FILESDIR}"/${PN}-4.15.0-docdir.patch
"${FILESDIR}"/${PN}-5.3.0-libdir.patch "${FILESDIR}"/${PN}-5.3.0-libdir.patch
"${FILESDIR}"/${PN}-5.18.0-docdir.patch
"${FILESDIR}"/${PN}-6.3.0-gettext-0.22.patch
) )
src_prepare() { src_prepare() {
@ -48,6 +46,9 @@ src_configure() {
# unnecessarily clutter CFLAGS (and fortran isn't used) # unnecessarily clutter CFLAGS (and fortran isn't used)
unset FCFLAGS unset FCFLAGS
# If set in user env, this breaks configure
unset PLATFORM
export DEBUG=-DNDEBUG export DEBUG=-DNDEBUG
# Package is honoring CFLAGS; No need to use OPTIMIZER anymore. # Package is honoring CFLAGS; No need to use OPTIMIZER anymore.
@ -55,9 +56,7 @@ src_configure() {
# flags. # flags.
export OPTIMIZER=" " export OPTIMIZER=" "
unset PLATFORM # if set in user env, this breaks configure # Avoid automagic on libdevmapper (bug #709694)
# Avoid automagic on libdevmapper, #709694
export ac_cv_search_dm_task_create=no export ac_cv_search_dm_task_create=no
# Build fails with -O3 (bug #712698) # Build fails with -O3 (bug #712698)
@ -67,6 +66,7 @@ src_configure() {
# https://www.spinics.net/lists/linux-xfs/msg30185.html # https://www.spinics.net/lists/linux-xfs/msg30185.html
# https://www.spinics.net/lists/linux-xfs/msg30272.html # https://www.spinics.net/lists/linux-xfs/msg30272.html
local myconf=( local myconf=(
--enable-static
--enable-blkid --enable-blkid
--with-crond-dir="${EPREFIX}/etc/cron.d" --with-crond-dir="${EPREFIX}/etc/cron.d"
--with-systemd-unit-dir="$(systemd_get_systemunitdir)" --with-systemd-unit-dir="$(systemd_get_systemunitdir)"

29
sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-5.14.1.ebuild → sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-6.4.0.ebuild vendored
View File

@ -1,34 +1,33 @@
# Copyright 1999-2021 Gentoo Authors # Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=7 EAPI=8
inherit flag-o-matic systemd usr-ldscript inherit flag-o-matic systemd usr-ldscript
DESCRIPTION="xfs filesystem utilities" DESCRIPTION="XFS filesystem utilities"
HOMEPAGE="https://xfs.wiki.kernel.org/" 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" SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
LICENSE="LGPL-2.1" LICENSE="LGPL-2.1"
SLOT="0" SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="icu libedit nls selinux" IUSE="icu libedit nls selinux"
RDEPEND=">=sys-apps/util-linux-2.17.2 RDEPEND="
dev-libs/inih dev-libs/inih
dev-libs/userspace-rcu dev-libs/userspace-rcu:=
>=sys-apps/util-linux-2.17.2
icu? ( dev-libs/icu:= ) icu? ( dev-libs/icu:= )
libedit? ( dev-libs/libedit ) libedit? ( dev-libs/libedit )
" "
DEPEND="${RDEPEND}" DEPEND="${RDEPEND}"
BDEPEND=" BDEPEND="nls? ( sys-devel/gettext )"
nls? ( sys-devel/gettext )
"
RDEPEND+=" selinux? ( sec-policy/selinux-xfs )" RDEPEND+=" selinux? ( sec-policy/selinux-xfs )"
PATCHES=( PATCHES=(
"${FILESDIR}"/${PN}-4.15.0-docdir.patch
"${FILESDIR}"/${PN}-5.3.0-libdir.patch "${FILESDIR}"/${PN}-5.3.0-libdir.patch
"${FILESDIR}"/${PN}-5.18.0-docdir.patch
) )
src_prepare() { src_prepare() {
@ -48,6 +47,9 @@ src_configure() {
# unnecessarily clutter CFLAGS (and fortran isn't used) # unnecessarily clutter CFLAGS (and fortran isn't used)
unset FCFLAGS unset FCFLAGS
# If set in user env, this breaks configure
unset PLATFORM
export DEBUG=-DNDEBUG export DEBUG=-DNDEBUG
# Package is honoring CFLAGS; No need to use OPTIMIZER anymore. # Package is honoring CFLAGS; No need to use OPTIMIZER anymore.
@ -55,9 +57,7 @@ src_configure() {
# flags. # flags.
export OPTIMIZER=" " export OPTIMIZER=" "
unset PLATFORM # if set in user env, this breaks configure # Avoid automagic on libdevmapper (bug #709694)
# Avoid automagic on libdevmapper, #709694
export ac_cv_search_dm_task_create=no export ac_cv_search_dm_task_create=no
# Build fails with -O3 (bug #712698) # Build fails with -O3 (bug #712698)
@ -67,6 +67,7 @@ src_configure() {
# https://www.spinics.net/lists/linux-xfs/msg30185.html # https://www.spinics.net/lists/linux-xfs/msg30185.html
# https://www.spinics.net/lists/linux-xfs/msg30272.html # https://www.spinics.net/lists/linux-xfs/msg30272.html
local myconf=( local myconf=(
--enable-static
--enable-blkid --enable-blkid
--with-crond-dir="${EPREFIX}/etc/cron.d" --with-crond-dir="${EPREFIX}/etc/cron.d"
--with-systemd-unit-dir="$(systemd_get_systemunitdir)" --with-systemd-unit-dir="$(systemd_get_systemunitdir)"