make.sh: Use enterchroot function in ipfiredist

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/tools/make-functions b/tools/make-functions
index 8854ddf819d8253cc011a631270b6a40c9b9a004..e581ceffbb20f8334e8676762915a7e9f640eb39 100644 (file)
--- a/tools/make-functions
+++ b/tools/make-functions
@@ -705,30 +705,13 @@ ipfiremake() {
 ipfiredist() {
        lfsmakecommoncheck $*
        [ $? == 1 ] && return 0
-       
-       # Install QEMU helper, if needed
-       qemu_install_helper
 
        local PKG_TIME_START=`date +%s`
-       chroot $LFS /tools/bin/env -i   HOME=/root \
-                                       TERM=$TERM PS1='\u:\w\$ ' \
-                                       PATH=/tools/ccache/bin:/bin:/usr/bin:/sbin:/usr/sbin \
-                                       VERSION=$VERSION \
-                                       CONFIG_ROOT=$CONFIG_ROOT \
-                                       NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
-                                       CFLAGS="${CFLAGS} ${HARDENING_CFLAGS}" \
-                                       CXXFLAGS="${CXXFLAGS} ${HARDENING_CFLAGS}" \
-                                       CCACHE_DIR=/usr/src/ccache \
-                                       CCACHE_COMPRESS="${CCACHE_COMPRESS}" \
-                                       CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \
-                                       KVER=$KVER \
-                                       BUILDTARGET="$BUILDTARGET" \
-                                       CROSSTARGET="${CROSSTARGET}" \
-                                       BUILD_ARCH="${BUILD_ARCH}" \
-                                       $(qemu_environ) \
-                                       $(fake_environ) \
-                                       /bin/bash -x -c "cd /usr/src/lfs && \
-                                       make -f $1 LFS_BASEDIR=/usr/src dist" >>$LOGFILE 2>&1
+       local PS1='\u:\w$ '
+
+       enterchroot \
+               bash -x -c "cd /usr/src/lfs && make -f $* LFS_BASEDIR=/usr/src dist" \
+               >> ${LOGFILE} 2>&1
 
        local COMPILE_SUCCESS=$?
        local PKG_TIME_END=`date +%s`