From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 15 Jun 2009 07:38:31 +0000 (+0200)
Subject: Make package immediately after build.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d52c21ec20eb82f5e3a892fa3536f01edc2da35;p=ipfire-3.x.git

Make package immediately after build.
---

diff --git a/tools/make-include b/tools/make-include
index 19e82aae3..30fd7db94 100644
--- a/tools/make-include
+++ b/tools/make-include
@@ -305,7 +305,6 @@ toolchain_make() {
 		PACKAGES_EXTRA="${PACKAGES_EXTRA}" \
 		PACKAGES_DEBUG="${PACKAGES_DEBUG}" \
 		\
-		ROOTFILE=$(rootfiles_findone $1 | sed "s,$BASEDIR,/usr/src,g") \
 		LOGFILE=$(echo ${LOGFILE} | sed "s,${BASEDIR},/usr/src,g") \
 		\
 		LFS="${LFS}" \
@@ -380,11 +379,10 @@ ipfire_make() {
 		PACKAGES_EXTRA="${PACKAGES_EXTRA}" \
 		PACKAGES_DEBUG="${PACKAGES_DEBUG}" \
 		\
-		ROOTFILE=$(rootfiles_findone $1 | sed "s,$BASEDIR,/usr/src,g") \
 		LOGFILE=$(echo ${LOGFILE} | sed "s,${BASEDIR},/usr/src,g") \
 		\
 		bash -x -c "cd /usr/src/lfs && \
-		make -f $* LFS_BASEDIR=/usr/src install" >> ${LOGFILE} 2>&1
+		make -f $* LFS_BASEDIR=/usr/src install packages" >> ${LOGFILE} 2>&1
 
 	local COMPILE_SUCCESS=$?
 	local PKG_TIME_END=$(date +%s)
@@ -455,7 +453,6 @@ package_make() {
 		PACKAGES_EXTRA="${PACKAGES_EXTRA}" \
 		PACKAGES_DEBUG="${PACKAGES_DEBUG}" \
 		\
-		ROOTFILE=$(rootfiles_findone $1 | sed "s,$BASEDIR,/usr/src,g") \
 		LOGFILE=$(echo ${LOGFILE} | sed "s,${BASEDIR},/usr/src,g") \
 		\
 		bash -x -c "cd /usr/src/lfs && \