From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 21 Apr 2017 10:06:08 +0000 (+0200)
Subject: make.sh: Drop installmake()
X-Git-Tag: v2.19-core112~96
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=2b4156d2e4e84536105a9a4166a52c2c895f92f7

make.sh: Drop installmake()

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

diff --git a/make.sh b/make.sh
index e803ce3c09..b54359f5af 100755
--- a/make.sh
+++ b/make.sh
@@ -897,7 +897,7 @@ buildinstaller() {
   export LOGFILE
   lfsmake2 memtest
   lfsmake2 installer
-  installmake strip
+  lfsmake2 strip
 }
 
 buildpackages() {
diff --git a/tools/make-functions b/tools/make-functions
index 45b5cd350f..ebe157a477 100644
--- a/tools/make-functions
+++ b/tools/make-functions
@@ -684,44 +684,6 @@ ipfiredist() {
 	return 0
 }
 
-installmake() {
-	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 \
-						SYSTEM_RELEASE="${SYSTEM_RELEASE}" \
-						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=1 CCACHE_HASHDIR=1 \
-						KVER=$KVER \
-						BUILDTARGET="$BUILDTARGET" \
-						CROSSTARGET="${CROSSTARGET}" \
-						BUILD_ARCH="${BUILD_ARCH}" \
-						LD_LIBRARY_PATH=/tools/lib \
-		    /tools/bin/bash -x -c "cd /usr/src/lfs && \
-		    /tools/bin/make -f $* LFS_BASEDIR=/usr/src install" >>$LOGFILE 2>&1
-
-	local COMPILE_SUCCESS=$?
-	local PKG_TIME_END=`date +%s`
-
-	if [ $COMPILE_SUCCESS -ne 0 ]; then
-		beautify result FAIL $[ $PKG_TIME_END - $PKG_TIME_START ]
-		exiterror "Building $*";
-	else
-		beautify result DONE $[ $PKG_TIME_END - $PKG_TIME_START ]
-	fi
-	return 0
-}
-
 update_langs() {
 		echo -ne "Checking the translations for missing or obsolete strings..."
 		chmod 755 $BASEDIR/tools/{check_strings.pl,sort_strings.pl,check_langs.sh}