From 496ea19056fa7e21d3512f10793cb032ddf4d2d1 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Thu, 22 Jun 2017 18:46:42 +0100
Subject: [PATCH] e2fsprogs: update to e2fsprogs-1.43.4, rework host build,
 ship full compile_et

---
 packages/devel/heimdal/package.mk      |  4 ++--
 packages/network/samba/package.mk      |  8 ++++----
 packages/sysutils/e2fsprogs/package.mk | 19 ++++++++-----------
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/packages/devel/heimdal/package.mk b/packages/devel/heimdal/package.mk
index 342b3e49a7..3a9df5e460 100644
--- a/packages/devel/heimdal/package.mk
+++ b/packages/devel/heimdal/package.mk
@@ -47,6 +47,6 @@ PKG_CONFIGURE_OPTS_HOST="--enable-static --disable-shared \
                          --disable-heimdal-documentation"
 
 makeinstall_host() {
-  mkdir -p $ROOT/$TOOLCHAIN/bin
-    cp -PR lib/asn1/asn1_compile $ROOT/$TOOLCHAIN/bin
+  mkdir -p $TOOLCHAIN/bin
+    cp -PR lib/asn1/asn1_compile $TOOLCHAIN/bin
 }
diff --git a/packages/network/samba/package.mk b/packages/network/samba/package.mk
index 837c247d3a..a8064fab0d 100644
--- a/packages/network/samba/package.mk
+++ b/packages/network/samba/package.mk
@@ -53,7 +53,7 @@ PKG_CONFIGURE_OPTS="--prefix=/usr \
                     --with-configdir=/run/samba \
                     --with-libiconv=$SYSROOT_PREFIX/usr \
                     --cross-compile \
-                    --cross-answers=$ROOT/$PKG_BUILD/cache.txt \
+                    --cross-answers=$PKG_BUILD/cache.txt \
                     --hostcc=gcc \
                     --enable-fhs \
                     --without-dmapi \
@@ -97,7 +97,7 @@ PKG_SAMBA_TARGET="smbclient"
 
 pre_configure_target() {
 # samba uses its own build directory
-  cd $ROOT/$PKG_BUILD
+  cd $PKG_BUILD
     rm -rf .$TARGET_NAME
 # samba fails to build with gold support
   strip_gold
@@ -112,8 +112,8 @@ pre_configure_target() {
 }
 
 configure_target() {
-  cp $PKG_DIR/config/samba4-cache.txt $ROOT/$PKG_BUILD/cache.txt
-    echo "Checking uname machine type: \"$TARGET_ARCH\"" >> $ROOT/$PKG_BUILD/cache.txt
+  cp $PKG_DIR/config/samba4-cache.txt $PKG_BUILD/cache.txt
+    echo "Checking uname machine type: \"$TARGET_ARCH\"" >> $PKG_BUILD/cache.txt
 
   PYTHON_CONFIG="$SYSROOT_PREFIX/usr/bin/python-config" \
   python_LDFLAGS="" python_LIBDIR="" \
diff --git a/packages/sysutils/e2fsprogs/package.mk b/packages/sysutils/e2fsprogs/package.mk
index 0c69c34779..78e1dca98a 100644
--- a/packages/sysutils/e2fsprogs/package.mk
+++ b/packages/sysutils/e2fsprogs/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="e2fsprogs"
-PKG_VERSION="1.43.3"
+PKG_VERSION="1.43.4"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://e2fsprogs.sourceforge.net/"
@@ -35,9 +35,9 @@ if [ "$HFSTOOLS" = "yes" ]; then
   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET diskdev_cmds"
 fi
 
-PKG_CONFIGURE_OPTS_HOST="--prefix=/usr \
-                         --bindir=/bin \
-                         --sbindir=/sbin"
+PKG_CONFIGURE_OPTS_HOST="--prefix=$TOOLCHAIN/ \
+                         --bindir=$TOOLCHAIN/bin \
+                         --sbindir=$TOOLCHAIN/sbin"
 
 PKG_CONFIGURE_OPTS_TARGET="BUILD_CC=$HOST_CC \
                            --enable-verbose-makecmds \
@@ -73,6 +73,8 @@ pre_make_host() {
 }
 
 post_makeinstall_target() {
+  make -C lib/et LIBMODE=644 DESTDIR=$SYSROOT_PREFIX install
+
   rm -rf $INSTALL/usr/sbin/badblocks
   rm -rf $INSTALL/usr/sbin/blkid
   rm -rf $INSTALL/usr/sbin/dumpe2fs
@@ -108,12 +110,7 @@ make_host() {
 }
 
 makeinstall_host() {
-  make -C lib/et LIBMODE=644 DESTDIR=$(pwd)/.install install
-  make -C lib/ext2fs LIBMODE=644 DESTDIR=$(pwd)/.install install
-
-  rm -fr $(pwd)/.install/bin
-  rm -fr $(pwd)/.install/usr/share
-
-  cp -fPa $(pwd)/.install/usr/* $TOOLCHAIN
+  make -C lib/et LIBMODE=644 install
+  make -C lib/ext2fs LIBMODE=644 install
 }