]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
Make package immediately after build.
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 15 Jun 2009 07:38:31 +0000 (09:38 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 15 Jun 2009 07:38:31 +0000 (09:38 +0200)
tools/make-include

index 19e82aae37fb1aadba6a2334fb5a3a9641831a5b..30fd7db9445ab031473c5a26a46b574f24b6bee3 100644 (file)
@@ -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 && \