Revision: 5196
http://ipcop.svn.sourceforge.net/ipcop/?rev=5196&view=rev
Author: gespinasse
Date: 2010-12-01 20:06:16 +0000 (Wed, 01 Dec 2010)
Log Message:
-----------
Fix the issue that PREPLOGFILE was removed after we already have written some
new log info.
So remove previous logs earlier.
Use a simple rm -f for previous log removal as those files are user-owned.
Add a few missing conversion from _build_00_preparation.log to PREPLOGFILE.
Remove the last spot of 05_packages.log unneeded since log splitting
Remove the hack for LATEST path
We don't need to remove with SUDO RM as the file is user-owned.
So no need to copy from {BASEDIR}/log_${MACHINE} and remove from
${LFS}/usr/src/log_${MACHINE}/${LATEST}
export PREPLOGFILE is not needed
Modified Paths:
--------------
ipcop/trunk/make.sh
Modified: ipcop/trunk/make.sh
===================================================================
--- ipcop/trunk/make.sh 2010-12-01 07:13:16 UTC (rev 5195)
+++ ipcop/trunk/make.sh 2010-12-01 20:06:16 UTC (rev 5196)
@@ -359,12 +359,9 @@
# Preliminary logs are send there
PREPLOGFILE=${BASEDIR}/log_${MACHINE}/_build_00_preparation.log
-export PREPLOGFILE
# find last failing log always at the same place
-# name is without the path as we RM using the build_${MACHINE} path
-# but cp from {BASEDIR}/log_${MACHINE}
-LATEST="_latest_interrupt.log"
+LATEST=log_${MACHINE}/_latest_interrupt.log
export CCACHE_DIR=${BASEDIR}/ccache
export CCACHE_HASHDIR=1
@@ -434,6 +431,12 @@
#################################################################################
${MKDIR} $BASEDIR/log_${MACHINE}
+# Remove previous log before writing into
+# Those are totaly remade at each build, so don't accumulate
+# (user owned, so no need to wait directories are mounted to be able to use
SUDO RM)
+rm -f ${PREPLOGFILE} ${BASEDIR}/${LATEST}
+rm -f ${BASEDIR}/log_${MACHINE}/05_packages/*
+
#########################################################################################################
# Ok, now's your chance to override any of the "customizable" variables
#
#
#
@@ -442,8 +445,8 @@
if [ -e ${IPCOP_CONFIG} ]; then
echo -ne "${BOLD}*** IPCop build .config found. Parsing ...${NORMAL}\n"
- # Now write the list of overwritten variables to
_build_00_preparation.log
- echo "=== LIST OF OVERWRITTEN VARIABLES ===" >>
${BASEDIR}/log_${MACHINE}/_build_00_preparation.log
+ # Now write the list of overwritten variables
+ echo "=== LIST OF OVERWRITTEN VARIABLES ===" >> ${PREPLOGFILE}
ORG_IFS=${IFS}
IFS=$'\n'
@@ -471,8 +474,7 @@
export `eval echo ${VARIABLE}`=${VALUE}
- echo -ne "Variable ${VARIABLE} was overwritten and is
now ${VALUE}\n" \
- >>
${BASEDIR}/log_${MACHINE}/_build_00_preparation.log
+ echo -ne "Variable ${VARIABLE} was overwritten and is
now ${VALUE}\n" >> ${PREPLOGFILE}
else
echo -ne "*** ${WARN}Skipping non-customizable variable
${VARIABLE} and disabling in .config\n"
@@ -480,7 +482,7 @@
fi
done
IFS=${ORG_IFS}
- echo "=== END OF LIST OF OVERWRITTEN VARIABLES ===" >>
${BASEDIR}/log_${MACHINE}/_build_00_preparation.log
+ echo "=== END OF LIST OF OVERWRITTEN VARIABLES ===" >> ${PREPLOGFILE}
echo -ne "${BOLD}*** Done parsing .config${NORMAL}\n"
else
@@ -796,8 +798,8 @@
echo -ne "Check ${PREPLOGFILE} for errors if applicable"
else
# stop during compilation
- cp ${LOGFILE} ${BASEDIR}/log_${MACHINE}/${LATEST}
- echo -ne "Check log_${MACHINE}/${LATEST} for errors if
applicable"
+ cp ${LOGFILE} ${BASEDIR}/${LATEST}
+ echo -ne "Check ${LATEST} for errors if applicable"
fi
# In case of an abnormal ending, make sure the cursor is visible
@@ -1081,9 +1083,6 @@
${SUDO} ${RM} ${LFS}/usr/src/lsalr 2>/dev/null
# List of packages is totally remade at each build
${RM} ${LFS}/usr/src/log_${MACHINE}/_build_06_othersrc-list.log
2>/dev/null
- # Those log are totally remade at each build, so don't accumulate log
- ${RM}
${LFS}/usr/src/log_${MACHINE}/_build_{00_preparation,05_packages}.log
2>/dev/null
- ${RM} ${LFS}/usr/src/log_${MACHINE}/${LATEST} 2>/dev/null
} # End of prepareenv()
@@ -1875,10 +1874,6 @@
${MKDIR} ${BASEDIR}/files_${MACHINE}/05_packages
${MKDIR} ${BASEDIR}/log_${MACHINE}/05_packages
- # we rebuild each time, so remove previous log
- # first be sure something to be removed (no -f at RM)
- touch ${BASEDIR}/log_${MACHINE}/05_packages/foo
- ${SUDO} ${RM} ${BASEDIR}/log_${MACHINE}/05_packages/*
chroot_make stage5
chroot_make installer
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Increase Visibility of Your 3D Game App & Earn a Chance To Win $500!
Tap into the largest installed PC base & get more eyes on your game by
optimizing for Intel(R) Graphics Technology. Get started today with the
Intel(R) Software Partner Program. Five $500 cash prizes are up for grabs.
http://p.sf.net/sfu/intelisp-dev2dev
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
