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

sys-fs/e2fsprogs: Sync with Gentoo

Browse Source 
It's from Gentoo commit c84288608b4210250bf60841cfd6d34a709fd1b9.
This commit is contained in:
Krzesimir Nowak 2022-05-06 19:42:06 +02:00
parent 6cf4830ff5
commit d9ce0cb089
5 changed files with 63 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/Manifest vendored
View File

@ -1,2 +1 @@
DIST e2fsprogs-1.46.4.tar.xz 7035200 BLAKE2B 473f7fd3f521b94cdaa68e37784a518fc1919387dd114f31b5338f1b4c472f86b150229ec3dcae8b73eac95330c0dea729befc8cea08bcf1e455c0b6652d6d2b SHA512 7d9cfdf00ed58e66049585e8382fe4977088956421a0fb8155900c69afd8857309ad2b9301b3f74c9c0afa7287a0ddba2fd1538fcf57858b37a9ab712390016d
DIST e2fsprogs-1.46.5.tar.xz 7040672 BLAKE2B 8d8c02e891c464782a7cff518c41d793fc73366b57e17d80ffc5afd96e6144e354290e667e9710509a9dde4e5dab7e7185c5bf084c5bfd26219f05e5e92e0830 SHA512 53282e1c524f62a95012b1aceef296d494f5238c82c9b08b29fbe6a803dbf7ccfdcd9124eb2f11fe2ff9de26387c78751a92c3217ca414f6db6242098a72d3fa

120
sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild vendored
View File

@ -1,120 +0,0 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit flag-o-matic systemd toolchain-funcs udev usr-ldscript
DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
HOMEPAGE="http://e2fsprogs.sourceforge.net/"
SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz"
LICENSE="GPL-2 BSD"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="cron fuse lto nls static-libs +threads"
RDEPEND="~sys-libs/${PN}-libs-${PV}
>=sys-apps/util-linux-2.16
cron? ( sys-fs/lvm2[-device-mapper-only(-)] )
fuse? ( sys-fs/fuse:0 )
nls? ( virtual/libintl )"
DEPEND="${RDEPEND}"
BDEPEND="
nls? ( sys-devel/gettext )
virtual/pkgconfig
sys-apps/texinfo
"
PATCHES=(
"${FILESDIR}"/${PN}-1.40-fbsd.patch
"${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
# Upstream patches (can usually removed with next version bump)
)
src_prepare() {
default
cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes"
# Get rid of doc -- we don't use them. This also prevents a sandbox
# violation due to mktexfmt invocation
rm -r doc || die "Failed to remove doc dir"
# blargh ... trick e2fsprogs into using e2fsprogs-libs
sed -i -r \
-e 's:@LIBINTL@:@LTLIBINTL@:' \
-e '/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:' \
-e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \
MCONFIG.in || die "muck libs" #122368
sed -i -r \
-e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
Makefile.in || die "remove subdirs"
ln -s $(which mk_cmds) lib/ss/ || die
# Avoid rebuild
echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h
}
src_configure() {
# Keep the package from doing silly things #261411
export VARTEXFONTS="${T}/fonts"
# needs open64() prototypes and friends
append-cppflags -D_GNU_SOURCE
local myeconfargs=(
--with-root-prefix="${EPREFIX}"
$(use_with cron crond-dir "${EPREFIX}/etc/cron.d")
--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
--with-udev-rules-dir="${EPREFIX}$(get_udevdir)/rules.d"
--enable-symlink-install
--enable-elf-shlibs
$(tc-has-tls || echo --disable-tls)
$(use_enable fuse fuse2fs)
$(use_enable nls)
--disable-libblkid
--disable-libuuid
--disable-fsck
--disable-uuidd
$(use_enable lto)
$(use_with threads pthread)
)
ac_cv_path_LDCONFIG=: econf "${myeconfargs[@]}"
if grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
eerror "INTL sanity check failed, aborting build."
eerror "Please post your ${S}/config.log file as an"
eerror "attachment to https://bugs.gentoo.org/show_bug.cgi?id=81096"
die "Preventing included intl cruft from building"
fi
}
src_compile() {
emake V=1 COMPILE_ET=compile_et MK_CMDS=mk_cmds
}
src_install() {
# need to set root_libdir= manually as any --libdir options in the
# econf above (i.e. multilib) will screw up the default #276465
emake \
STRIP=: \
root_libdir="${EPREFIX}/usr/$(get_libdir)" \
DESTDIR="${D}" \
install
einstalldocs
insinto /etc
doins "${FILESDIR}"/e2fsck.conf
# Move shared libraries to /lib/, install static libraries to
# /usr/lib/, and install linker scripts to /usr/lib/.
gen_usr_ldscript -a e2p ext2fs
# configure doesn't have an option to disable static libs :/
if ! use static-libs ; then
find "${ED}" -name '*.a' -delete || die
fi
}

58
sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild → sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r1.ebuild vendored
View File

@ -11,34 +11,36 @@ SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/$
LICENSE="GPL-2 BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="cron fuse lto nls static-libs +threads +tools"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="cron fuse lto nls static-libs test +threads +tools"
RESTRICT="!test? ( test )"
RDEPEND="
!sys-libs/${PN}-libs
cron? ( sys-fs/lvm2[-device-mapper-only(-)] )
fuse? ( sys-fs/fuse:0 )
nls? ( virtual/libintl )
tools? ( >=sys-apps/util-linux-2.16 )"
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig
tools? ( sys-apps/util-linux )"
# For testing lib/ext2fs, lib/support/libsupport.a is required, which
# unconditionally includes '<blkid/blkid.h>' from sys-apps/util-linux.
DEPEND="
${RDEPEND}
test? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )"
BDEPEND="
virtual/pkgconfig
sys-apps/texinfo
nls? ( sys-devel/gettext )"
PATCHES=(
"${FILESDIR}"/${PN}-1.40-fbsd.patch
"${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
# Upstream patches (can usually removed with next version bump)
"${FILESDIR}"/${P}-parallel-make.patch
)
pkg_setup() {
if use tools ; then
MULTILIB_WRAPPED_HEADERS=(
MULTILIB_WRAPPED_HEADERS=(
/usr/include/ext2fs/ext2_types.h
)
fi
}
)
src_prepare() {
default
@ -101,50 +103,44 @@ multilib_src_configure() {
}
multilib_src_compile() {
if ! multilib_is_native_abi || ! use tools ; then
if multilib_is_native_abi && use tools ; then
emake V=1
else
emake -C lib/et V=1
emake -C lib/ss V=1
if use tools ; then
emake -C lib/ext2fs V=1
emake -C lib/e2p V=1
fi
return 0
fi
emake V=1
}
multilib_src_test() {
if multilib_is_native_abi ; then
if multilib_is_native_abi && use tools ; then
emake V=1 check
else
# required by lib/ext2fs's check target
emake -C lib/support V=1
# For non-native, there's no binaries to test. Just libraries.
emake -C lib/et V=1 check
emake -C lib/ss V=1 check
emake -C lib/ext2fs V=1 check
emake -C lib/e2p V=1 check
fi
}
multilib_src_install() {
if ! multilib_is_native_abi || ! use tools ; then
if multilib_is_native_abi && use tools ; then
emake STRIP=':' V=1 DESTDIR="${D}" install
else
emake -C lib/et V=1 DESTDIR="${D}" install
emake -C lib/ss V=1 DESTDIR="${D}" install
if use tools ; then
emake -C lib/ext2fs V=1 DESTDIR="${D}" install
emake -C lib/e2p V=1 DESTDIR="${D}" install
fi
else
emake \
STRIP=: \
DESTDIR="${D}" \
install
# Move shared libraries to /lib/, install static libraries to
# /usr/lib/, and install linker scripts to /usr/lib/.
gen_usr_ldscript -a e2p ext2fs
fi
gen_usr_ldscript -a com_err ss $(usex kernel_linux '' 'uuid blkid')
gen_usr_ldscript -a com_err ss ext2fs e2p
# configure doesn't have an option to disable static libs :/
if ! use static-libs ; then

11
sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/files/e2fsprogs-1.40-fbsd.patch vendored
View File

@ -1,11 +0,0 @@
--- a/lib/ext2fs/ext2_fs.h
+++ b/lib/ext2fs/ext2_fs.h
@@ -414,7 +414,7 @@
#define i_size_high i_dir_acl
-#if defined(__KERNEL__) || defined(__linux__)
+#if defined(__KERNEL__) || defined(__linux__) || defined(__FreeBSD__)
#define i_reserved1 osd1.linux1.l_i_reserved1
#define i_frag osd2.linux2.l_i_frag
#define i_fsize osd2.linux2.l_i_fsize

29
sdk_container/src/third_party/portage-stable/sys-fs/e2fsprogs/files/e2fsprogs-1.46.5-parallel-make.patch vendored Normal file
View File

@ -0,0 +1,29 @@
--- a/lib/ext2fs/Makefile.in
+++ b/lib/ext2fs/Makefile.in
@@ -729,6 +729,12 @@
$(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/ext2_ext_attr.h \
$(srcdir)/hashmap.h $(srcdir)/bitops.h $(srcdir)/bmap64.h $(srcdir)/rbtree.h \
$(srcdir)/compiler.h
+blknum.o: $(srcdir)/blknum.c $(top_builddir)/lib/config.h \
+ $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \
+ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \
+ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
+ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(srcdir)/ext2_ext_attr.h $(srcdir)/hashmap.h $(srcdir)/bitops.h
block.o: $(srcdir)/block.c $(top_builddir)/lib/config.h \
$(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \
$(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \
@@ -837,6 +843,13 @@
$(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \
$(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fsP.h \
$(srcdir)/ext2fs.h $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h \
+ $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/ext2_ext_attr.h \
+ $(srcdir)/hashmap.h $(srcdir)/bitops.h $(srcdir)/e2image.h
+fallocate.o: $(srcdir)/fallocate.c $(top_builddir)/lib/config.h \
+ $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \
+ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fsP.h \
+ $(srcdir)/ext2fs.h $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h \
$(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \
$(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/ext2_ext_attr.h \
$(srcdir)/hashmap.h $(srcdir)/bitops.h $(srcdir)/e2image.h