e2fsprogs: update to e2fsprogs-1.43.4, rework host build, ship full compile_et

This commit is contained in:
MilhouseVH 2017-05-06 21:16:56 +01:00
parent 57b0402cb4
commit 0d88273887

View File

@ -17,7 +17,7 @@
################################################################################ ################################################################################
PKG_NAME="e2fsprogs" PKG_NAME="e2fsprogs"
PKG_VERSION="1.43.3" PKG_VERSION="1.43.4"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"
PKG_SITE="http://e2fsprogs.sourceforge.net/" PKG_SITE="http://e2fsprogs.sourceforge.net/"
@ -35,9 +35,9 @@ if [ "$HFSTOOLS" = "yes" ]; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET diskdev_cmds" PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET diskdev_cmds"
fi fi
PKG_CONFIGURE_OPTS_HOST="--prefix=/usr \ PKG_CONFIGURE_OPTS_HOST="--prefix=$TOOLCHAIN/ \
--bindir=/bin \ --bindir=$TOOLCHAIN/bin \
--sbindir=/sbin" --sbindir=$TOOLCHAIN/sbin"
PKG_CONFIGURE_OPTS_TARGET="BUILD_CC=$HOST_CC \ PKG_CONFIGURE_OPTS_TARGET="BUILD_CC=$HOST_CC \
--enable-verbose-makecmds \ --enable-verbose-makecmds \
@ -72,6 +72,8 @@ pre_make_host() {
} }
post_makeinstall_target() { post_makeinstall_target() {
make -C lib/et DESTDIR=$SYSROOT_PREFIX install
rm -rf $INSTALL/usr/sbin/badblocks rm -rf $INSTALL/usr/sbin/badblocks
rm -rf $INSTALL/usr/sbin/blkid rm -rf $INSTALL/usr/sbin/blkid
rm -rf $INSTALL/usr/sbin/dumpe2fs rm -rf $INSTALL/usr/sbin/dumpe2fs
@ -107,15 +109,7 @@ make_host() {
} }
makeinstall_host() { makeinstall_host() {
make -C lib/et DESTDIR=$(pwd)/.install install make -C lib/et install
make -C lib/ext2fs DESTDIR=$(pwd)/.install install make -C lib/ext2fs install
rm -fr $(pwd)/.install/bin
rm -fr $(pwd)/.install/usr/share
# Ensure installed files are writeable and not read-only, otherwise future package bumps will fail to overwrite toolchain
chmod -R +w $(pwd)/.install/usr/*
cp -Pa $(pwd)/.install/usr/* $TOOLCHAIN
} }