sys-fs/e2fsprogs: Trim unneeded files

This commit is contained in:
Andrew Jeddeloh 2016-05-26 17:36:21 -07:00
parent eafd56358c
commit baecad72bc
6 changed files with 0 additions and 1771 deletions

View File

@ -1,128 +0,0 @@
# ChangeLog for sys-fs/e2fsprogs
# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
# (auto-generated from git log)
*e2fsprogs-1.42.13 (09 Aug 2015)
*e2fsprogs-1.42.12 (09 Aug 2015)
*e2fsprogs-1.41.7-r1 (09 Aug 2015)
09 Aug 2015; Robin H. Johnson <robbat2@gentoo.org>
+e2fsprogs-1.41.7-r1.ebuild, +e2fsprogs-1.42.12.ebuild,
+e2fsprogs-1.42.13.ebuild,
+files/0001-resize2fs-Fix-error-message-so-the-mountpoint-is-pri.patch,
+files/e2fsck.conf, +files/e2fsprogs-1.38-tests-locale.patch,
+files/e2fsprogs-1.40-fbsd.patch, +files/e2fsprogs-1.41.5-makefile.patch,
+files/e2fsprogs-1.41.8-makefile.patch,
+files/e2fsprogs-1.42.10-e2fsck-fix-makefile-dependency.patch,
+files/e2fsprogs-1.42.10-fix-build-cflags.patch,
+files/e2fsprogs-1.42.13-fix-build-cflags.patch, +files/fsck_ext2fs.8,
+files/fsck_ext2fs.c, +metadata.xml:
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration
tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this
project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo
developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve
cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014
work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on
the bikeshed
24 Aug 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
Use https by default
Convert all URLs for sites supporting encrypted connections from http to
https
Signed-off-by: Justin Lecher <jlec@gentoo.org>
24 Aug 2015; Justin Lecher <jlec@gentoo.org> e2fsprogs-1.41.7-r1.ebuild,
e2fsprogs-1.42.12.ebuild, e2fsprogs-1.42.13.ebuild:
Use https by default
Convert all URLs for sites supporting encrypted connections from http to
https
Signed-off-by: Justin Lecher <jlec@gentoo.org>
24 Aug 2015; Mike Gilbert <floppym@gentoo.org> metadata.xml:
Revert DOCTYPE SYSTEM https changes in metadata.xml
repoman does not yet accept the https version.
This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450.
Bug: https://bugs.gentoo.org/552720
17 Sep 2015; Mike Frysinger <vapier@gentoo.org> e2fsprogs-1.42.13.ebuild,
+files/e2fsprogs-1.42.13-subst-perms.patch:
workaround buggy NFS when building manpages #550986
24 Nov 2015; Mike Frysinger <vapier@gentoo.org> metadata.xml:
standardize various metadata.xml style
31 Dec 2015; Mike Frysinger <vapier@gentoo.org> e2fsprogs-1.42.13.ebuild:
mark 1.42.13 arm64/m68k/s390/sh stable
24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
Unify quoting in metadata.xml files for machine processing
Force unified quoting in all metadata.xml files since lxml does not
preserve original use of single and double quotes. Ensuring unified
quoting before the process allows distinguishing the GLEP 67-related
metadata.xml changes from unrelated quoting changes.
24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
Replace all herds with appropriate projects (GLEP 67)
Replace all uses of herd with appropriate project maintainers, or no
maintainers in case of herds requested to be disbanded.
24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
Set appropriate maintainer types in metadata.xml (GLEP 67)
29 Mar 2016; Mike Frysinger <vapier@gentoo.org> -e2fsprogs-1.42.12.ebuild,
-files/e2fsprogs-1.42.10-e2fsck-fix-makefile-dependency.patch,
-files/e2fsprogs-1.42.10-fix-build-cflags.patch:
sys-libs/e2fsprogs-libs & sys-fs/e2fsprogs: drop old 1.42.12 versions
29 Mar 2016; Mike Frysinger <vapier@gentoo.org> e2fsprogs-1.42.13.ebuild,
+files/e2fsprogs-1.42.13-sysmacros.patch:
fix build w/newer glibc #577946
*e2fsprogs-1.43 (18 May 2016)
18 May 2016; Mike Frysinger <vapier@gentoo.org> +e2fsprogs-1.43.ebuild,
+files/e2fsprogs-1.43-sysmacros.patch:
sys-libs/e2fsprogs-libs & sys-fs/e2fsprogs: version bump to 1.43
18 May 2016; Mike Frysinger <vapier@gentoo.org> -e2fsprogs-1.41.7-r1.ebuild,
-files/0001-resize2fs-Fix-error-message-so-the-mountpoint-is-pri.patch,
-files/e2fsprogs-1.38-tests-locale.patch,
-files/e2fsprogs-1.41.5-makefile.patch:
sys-libs/e2fsprogs-libs & sys-fs/e2fsprogs: drop old 1.41.7 version
25 May 2016; Mike Frysinger <vapier@gentoo.org> e2fsprogs-1.43.ebuild,
metadata.xml:
add USE=fuse to control fuse2fs

File diff suppressed because it is too large Load Diff

View File

@ -1,17 +1,2 @@
AUX e2fsck.conf 138 SHA256 c2864aa7c5c5bf27227909bdb9af395fc07294d1f93d372ef10c79309d7aec08 SHA512 d10a8ef566a60815b6f65414d84d23f3ec535c2a93cd780d4425488465f4eff6910c20d0163d1b7d334e9f4c707beab35bf63078b9ec3a5602763ea219bddbef WHIRLPOOL b05c69b375411efe850a993a244e26513d6e4a8c1cfb3ea91617a283c819a47f2200a459849285a0e60288e86869d624aeee0589f4a6b9243572c500671f3b31
AUX e2fsprogs-1.40-fbsd.patch 352 SHA256 52865c6600fa0f601a89e4396797ae2d23a1ed895e64b098c36e8bcab1ac8505 SHA512 86374e641f958d7c4b53eb44abf7933af064b55a38fef6ca26f848bb63f0c6bf2966852c7cf0770337aef95ff965de95ef282205771e86be36e7ad74e8f81146 WHIRLPOOL b8889db0ced2312a06cbf2ca135340a9cb6c88aa0e3fc467f4cb4dc3c40c90f4be57d1678a735ef42a1d4b8313bcd1a3130d899cf5e9af39bfd13a37d1b1d449
AUX e2fsprogs-1.41.8-makefile.patch 317 SHA256 f8a4e2180f557c3bb9a50c38300e406420b3df296f50d6eab59d0b28cb65904d SHA512 dbd738affe910d3812ca4d969a6d4295b09abc413cab23f29dcbd0c1e82eefa095a61a377c494dd9b7e1d189d4edadc469dbf2d1a1068c11dd5fc8311bd83f8f WHIRLPOOL f81ecb87217bb312bbbb08357f76b2d5d7c2dc9cdee69d37e67e7b34632f4a3f3d2bab66aa600fa98776808b30cada735de05135ac60a5c2f9b59daf88b7eb53
AUX e2fsprogs-1.42.13-fix-build-cflags.patch 290 SHA256 3dc8246ee1d00d1ff4652aad0c4768d8a94317a5e8580507da33d23d8dbcf622 SHA512 fed2a8502fafb56a21c88d680a42848bdc8921b228f74842ce3f702279917b6e6c0d1204ee060ea0d2d5ebb02465fc1f3d1a4304068a59b45bf1ddfbdfd46507 WHIRLPOOL d68c4944734a67320a75f8e951b714b3fda08b220680797412ce946bb3c4f531074e4e8417ae92afec5b3d997ac20322f6e87c328b9269ef497a9a33da2c48e7
AUX e2fsprogs-1.42.13-subst-perms.patch 918 SHA256 4b8005ef30e7772a0f27a4c36e230792f1fe4ec8272461cc8a57ab63ba937651 SHA512 f69b4f95fd3f7a9066642ed751518714b392f78e31a1be54e7bbb5c646438d8d3359324c8031c5ad97aec4abf10af08e3240b6a40dd9abb442c0e719010dde2d WHIRLPOOL c31e6cb47cc2753ae9e0a44c8a13f54b94da1f6e158b2f2d5d3f775118208c1fb1bf4b781564339e704e7dfd440d4b1ac3674c2fde3b42e75e4de5ccb94d2dfe
AUX e2fsprogs-1.42.13-sysmacros.patch 1920 SHA256 6a954db84cfecab074b1d80d1923d74319a825074292e4274a60e0806989f7b4 SHA512 e987f1ab86b21e480d2b1461177c327ba32717e91e567c0bccdca7c7ea245305f63111f3beec1f4ed421ff97995a2c1e65e13bb563cad3f924bc259462f9f49d WHIRLPOOL afa58c925830aadd3f62e1c502a1fd39e019941b9c75b98c4d04d43eecc4f063dd0bf099339166a4141514562af2eefad3a7d7748035294bad7459f6bd981008
AUX e2fsprogs-1.43-sysmacros.patch 3301 SHA256 63ca9a2808ddfa62832447b9c1b4cab939849a34648d3445e09eac72810e0035 SHA512 181d1f71eb6776357521115ccd85227ee5c83bb798f198624722dc71e96f44f301ea79034182000f123fb9fc05db67de51206ff398c1a95f59b0f4dda8ba9ac6 WHIRLPOOL 5114aaa517e64831c24763470698d2913f042aa4424ef905aa32cf518e0889fcc5b9944e8e4dc78301594827bbfe4364314d76421e5de4b40043edb3db507f97
AUX fsck_ext2fs.8 3751 SHA256 750efa9a54ff23f9494b20396de9c7464747a721b6a0a08c1e564c06778888c8 SHA512 d8f0bf3d7d299a9c28e2cea0934d0a905f79aceac49de7c89031de54a663f27ded1361108aee22e0d37590634a94dc39db23e0bdb0d3405e92ae52a02d69d402 WHIRLPOOL 6958bf9d93bbb5772206caf09b974fd64e9a6dccc601777c94315bf41c8b4618759bdf1d88431f24aec1b5fb76a6e5869b39ca2804f7192817ec2b5105ca73bc
AUX fsck_ext2fs.c 2742 SHA256 5923e37addc2adffc2e51f21e667f879aef4daae14cb167c3e686da555f4ea63 SHA512 db2da9fd7f61282d79f22f2f461ee40fc85efa893d534fa364b803bba4e5ffb14677276db94e4482b3444411f11847d4f2c23c9994df99a826eb5eabe815088a WHIRLPOOL a2e9247a3bf25595676504fcef5532bd7ff18e034bb685116e21646b95d500a7d917eedd47ee869c77c8b7d9366dfadda7488ba7d0e768b0b4be3ff34f17d2fc
DIST e2fsprogs-1.42.13.tar.gz 6511931 SHA256 59993ff3a44f82e504561e0ebf95e8c8fa9f9f5746eb6a7182239605d2a4e2d4 SHA512 d341790f55c3bff34425369063757280b9ba6ac08f405e14f94f299345ae76c0dc6e90871b746cc98c73467448d888fe5bc029688b5eed5fd22c3c37bf285cd0 WHIRLPOOL 2b26e355ad8e378cc7402be5fd5f5abe0af2aa6a1214b357dca682b922aa07c97af427b369ef21ddb3ee731768234a5f5faf488b92a68b0175d07845dbe7783f DIST e2fsprogs-1.42.13.tar.gz 6511931 SHA256 59993ff3a44f82e504561e0ebf95e8c8fa9f9f5746eb6a7182239605d2a4e2d4 SHA512 d341790f55c3bff34425369063757280b9ba6ac08f405e14f94f299345ae76c0dc6e90871b746cc98c73467448d888fe5bc029688b5eed5fd22c3c37bf285cd0 WHIRLPOOL 2b26e355ad8e378cc7402be5fd5f5abe0af2aa6a1214b357dca682b922aa07c97af427b369ef21ddb3ee731768234a5f5faf488b92a68b0175d07845dbe7783f
DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 SHA256 3904654080b7f7776e97b703d17e1b59ae1d6f5e0cf32193b86e986bc0a9b396 SHA512 591a7c80d65082eebcdc455028be6ade05c9aae96c94f654106be0facef330a8875dae82891e6e3ad2b48dece2b4e1c1940dbc47cd3eba3e6eea3b5ddba9a8fc WHIRLPOOL ae6fc015fa77bfbde7a4ba2205c014b655e736c4ed5cb63a913245c6c40fa0637b65fa3eec6399dd1793c494892b76e0bbc12ffa6ac9c39d4da27333d8bbf6c7 DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 SHA256 3904654080b7f7776e97b703d17e1b59ae1d6f5e0cf32193b86e986bc0a9b396 SHA512 591a7c80d65082eebcdc455028be6ade05c9aae96c94f654106be0facef330a8875dae82891e6e3ad2b48dece2b4e1c1940dbc47cd3eba3e6eea3b5ddba9a8fc WHIRLPOOL ae6fc015fa77bfbde7a4ba2205c014b655e736c4ed5cb63a913245c6c40fa0637b65fa3eec6399dd1793c494892b76e0bbc12ffa6ac9c39d4da27333d8bbf6c7
DIST e2fsprogs-1.43.tar.xz 5086756 SHA256 d027eec0282e169eb55229beefca258c425c9d96f65292e2c004012d5353cd38 SHA512 f5f2d9331ebbec6530c9f41ce9c2e2296454f76b125e61802a36b8fe1f0d0f71f036275d7ff2d29bb0555b9daa6be8ac925d38192eb5085d3427ff6003d4bb78 WHIRLPOOL 4bcf553285e8cb4b347e3edc22e0d3cac206be1aa50196be5356561aabed57568f2cb6ef56988dba5c305bf801723b2cd15fc2fc907ba2f0373a16ef19ff765e
EBUILD e2fsprogs-1.42.13.ebuild 3686 SHA256 e526f7cb6d2f3ab699e7c015a120642a2fc2fa0d72d3014b0df98e26fd090923 SHA512 11dc8872bf1eafdc086936fce3293d2eb2cc2c790dca41c3815638ea8c4c4fa0764a734d2e6d6a60732df5f77644e41a4163ea1b4d2a77d67fa3b5ab93ee21aa WHIRLPOOL d0699183aedac2f85023629e7790a18f4790be1f541f56faf135daddef765cc8dec9e5430adb1d75d83f1ad8c1de6e420b7c7d0b578c3e5839ccdc22ad092ed9
EBUILD e2fsprogs-1.43.ebuild 3760 SHA256 2e6cf377faa45989d0be23ce1a91a4aa991c64b41b1c7ace6e858a8906b7f360 SHA512 38da440c81242dc71779d8e10ccceb19bcf6add7c36e276edde7ab80622639662e9989ade95976e6f1b0132e867b52f41351645b1ba4492d5d1f649c50a14520 WHIRLPOOL 3784acdbec0a3e183fe72b710d07f819efc38423e76c5774a516d232059c7cab05f5c248c6419968e246e1baf4cd965342e677307ab14c7456adbca845afb542
MISC ChangeLog 5180 SHA256 a829036924f836c8f4fc5655282d975624a8c1e78b1e3dba36a0b1eac4359dc1 SHA512 3bc5eb5ffd1ca41911582c45778434dc336549157d053abaa7ce07d1e0cf877225dd6aa39c025c941f15062d24a3601e4e5ffe45bb0e6e47599e97a7b445336e WHIRLPOOL 7bb4a60bd9dff3daa2572c52713b5d8cc596381d3bc2d536aff5b61915b65379b61ea1c322443854528b1e9bbd8e6f101c71513928b8477caffe14acaa581937
MISC ChangeLog-2015 48117 SHA256 fd49ccd4dc8e7a53c8cba64fb936f960ee7c58fcf4150485321b23475a193f84 SHA512 82134fcce2aaa6bf15f3339b79b657b4e0827a132cca8c89a6521f7c6bc1246d3d55cd46d6c9adbd5b3e6f458e9f4e5e267d10f4c9929f15c9cd985949f5ee85 WHIRLPOOL ed9f1377d27424101d492f92a515cdf60f723cd6f519ea8a82b16d46ec86c7f297b8224b6d2833c83a6ca5e4c6f2140e7155beb1ce0d45f503debc51d71b9db2
MISC metadata.xml 520 SHA256 d7e8aff0886fa1a93bdd7f347cd5850753bc1cf1cf6eefde71e98a8aa6ac5eb4 SHA512 a5ff91610ed175147f1a9c2c725a30380908c02fc04c6b7df2792cb4fd805f9137374d2a910e456128a7bf2fec9e83af3063bcb5f2ad51394bed8bed648e3905 WHIRLPOOL 2f2712617962a77cc37b8761ec4965fd61654a084de695f72cb1c2a4a678a76dbb9cd4e1b5aed67ac6649f7222cb75f86bc36e24fce96a68f8448d33a733f69a

View File

@ -1,129 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="5"
case ${PV} in
*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
*) UP_PV=${PV} ;;
esac
inherit eutils flag-o-matic multilib toolchain-funcs
DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
HOMEPAGE="http://e2fsprogs.sourceforge.net/"
SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.xz
mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${UP_PV}/${PN}-${UP_PV}.tar.xz
elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )"
LICENSE="GPL-2 BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint"
IUSE="fuse nls static-libs elibc_FreeBSD"
RDEPEND="~sys-libs/${PN}-libs-${PV}
>=sys-apps/util-linux-2.16
fuse? ( sys-fs/fuse )
nls? ( virtual/libintl )"
DEPEND="${RDEPEND}
nls? ( sys-devel/gettext )
virtual/pkgconfig
sys-apps/texinfo"
S=${WORKDIR}/${P%_pre*}
src_prepare() {
epatch "${FILESDIR}"/${PN}-1.41.8-makefile.patch
epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch
if [[ ${CHOST} == *-mint* ]] ; then
epatch "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch
fi
epatch "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
epatch "${FILESDIR}"/${PN}-1.43-sysmacros.patch
# blargh ... trick e2fsprogs into using e2fsprogs-libs
rm -rf doc
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
ac_cv_path_LDCONFIG=: \
econf \
--with-root-prefix="${EPREFIX}/" \
--enable-symlink-install \
$(tc-is-static-only || echo --enable-elf-shlibs) \
$(tc-has-tls || echo --disable-tls) \
--without-included-gettext \
$(use_enable fuse fuse2fs) \
$(use_enable nls) \
--disable-libblkid \
--disable-libuuid \
--disable-fsck \
--disable-uuidd
if [[ ${CHOST} != *-uclibc ]] && 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
# Build the FreeBSD helper
if use elibc_FreeBSD ; then
cp "${FILESDIR}"/fsck_ext2fs.c .
emake V=1 fsck_ext2fs
fi
}
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 install-libs
dodoc README RELEASE-NOTES
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 :/
use static-libs || find "${D}" -name '*.a' -delete
if use elibc_FreeBSD ; then
# Install helpers for us
into /
dosbin "${S}"/fsck_ext2fs
doman "${FILESDIR}"/fsck_ext2fs.8
# filefrag is linux only
rm \
"${ED}"/usr/sbin/filefrag \
"${ED}"/usr/share/man/man8/filefrag.8 || die
fi
}

View File

@ -1,125 +0,0 @@
From 30ef41f68703b6a16027cc8787118b87f1462dff Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 28 Mar 2016 20:31:33 -0400
Subject: [PATCH e2fsprogs] include sys/sysmacros.h as needed
The minor/major/makedev macros are not entirely standard. glibc has had
the definitions in sys/sysmacros.h since the start, and wants to move away
from always defining them implicitly via sys/types.h (as this pollutes the
namespace in violation of POSIX). Other C libraries have already dropped
them. Since the configure script already checks for this header, use that
to pull in the header in files that use these macros.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
debugfs/debugfs.c | 3 +++
lib/blkid/devname.c | 3 +++
lib/blkid/devno.c | 3 +++
lib/ext2fs/finddev.c | 3 +++
lib/ext2fs/ismounted.c | 3 +++
misc/create_inode.c | 4 ++++
misc/mk_hugefiles.c | 3 +++
7 files changed, 22 insertions(+)
diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
index ba8be40..7d481bc 100644
--- a/debugfs/debugfs.c
+++ b/debugfs/debugfs.c
@@ -26,6 +26,9 @@ extern char *optarg;
#include <errno.h>
#endif
#include <fcntl.h>
+#ifdef HAVE_SYS_SYSMACROS_H
+#include <sys/sysmacros.h>
+#endif
#include "debugfs.h"
#include "uuid/uuid.h"
diff --git a/lib/blkid/devname.c b/lib/blkid/devname.c
index 3e2efa9..671e781 100644
--- a/lib/blkid/devname.c
+++ b/lib/blkid/devname.c
@@ -36,6 +36,9 @@
#if HAVE_SYS_MKDEV_H
#include <sys/mkdev.h>
#endif
+#ifdef HAVE_SYS_SYSMACROS_H
+#include <sys/sysmacros.h>
+#endif
#include <time.h>
#include "blkidP.h"
diff --git a/lib/blkid/devno.c b/lib/blkid/devno.c
index 479d977..61e6fc7 100644
--- a/lib/blkid/devno.c
+++ b/lib/blkid/devno.c
@@ -31,6 +31,9 @@
#if HAVE_SYS_MKDEV_H
#include <sys/mkdev.h>
#endif
+#ifdef HAVE_SYS_SYSMACROS_H
+#include <sys/sysmacros.h>
+#endif
#include "blkidP.h"
diff --git a/lib/ext2fs/finddev.c b/lib/ext2fs/finddev.c
index 311608d..62fa0db 100644
--- a/lib/ext2fs/finddev.c
+++ b/lib/ext2fs/finddev.c
@@ -31,6 +31,9 @@
#if HAVE_SYS_MKDEV_H
#include <sys/mkdev.h>
#endif
+#ifdef HAVE_SYS_SYSMACROS_H
+#include <sys/sysmacros.h>
+#endif
#include "ext2_fs.h"
#include "ext2fs.h"
diff --git a/lib/ext2fs/ismounted.c b/lib/ext2fs/ismounted.c
index e0f69dd..7404996 100644
--- a/lib/ext2fs/ismounted.c
+++ b/lib/ext2fs/ismounted.c
@@ -49,6 +49,9 @@
#if HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
+#ifdef HAVE_SYS_SYSMACROS_H
+#include <sys/sysmacros.h>
+#endif
#include "ext2_fs.h"
#include "ext2fs.h"
diff --git a/misc/create_inode.c b/misc/create_inode.c
index 4dbd8e5..98aeb41 100644
--- a/misc/create_inode.c
+++ b/misc/create_inode.c
@@ -22,6 +22,10 @@
#include <attr/xattr.h>
#endif
#include <sys/ioctl.h>
+#ifdef HAVE_SYS_SYSMACROS_H
+#include <sys/sysmacros.h>
+#endif
+
#include <ext2fs/ext2fs.h>
#include <ext2fs/ext2_types.h>
#include <ext2fs/fiemap.h>
diff --git a/misc/mk_hugefiles.c b/misc/mk_hugefiles.c
index 71a15c5..00e95cd 100644
--- a/misc/mk_hugefiles.c
+++ b/misc/mk_hugefiles.c
@@ -35,6 +35,9 @@ extern int optind;
#include <sys/ioctl.h>
#include <sys/types.h>
#include <sys/stat.h>
+#ifdef HAVE_SYS_SYSMACROS_H
+#include <sys/sysmacros.h>
+#endif
#include <libgen.h>
#include <limits.h>
#include <blkid/blkid.h>
--
2.8.2

View File

@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>base-system@gentoo.org</email>
<name>Gentoo Base System</name>
</maintainer>
<use>
<flag name='fuse'>Build fuse2fs, a FUSE file system client for ext2/ext3/ext4 file systems</flag>
</use>
<upstream>
<remote-id type="cpe">cpe:/a:ext2_filesystems_utilities:e2fsprogs</remote-id>
<remote-id type="sourceforge">e2fsprogs</remote-id>
</upstream>
</pkgmetadata>