From: Gilles E. <ges...@us...> - 2006-08-29 19:44:00
|
Update of /cvsroot/ipcop/ipcop In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv3763 Modified Files: make.sh Log Message: Change the chrooted log dir to have same name as outside chroot. This is much simplier. Testing changes to build a package with all sources, code wich was working for 1.4 did not work for 1.5 because in Config DIR_INFO was not usable inside MD5 macro. Even there was already two different values for DIR_INFO depending if building toolchain or not, this did not work during ./make.sh prefetch for MD5 Better than adding another condition, make code simplier by using same name. Index: make.sh =================================================================== RCS file: /cvsroot/ipcop/ipcop/make.sh,v retrieving revision 1.277 retrieving revision 1.278 diff -C2 -d -r1.277 -r1.278 *** make.sh 27 Aug 2006 21:29:40 -0000 1.277 --- make.sh 29 Aug 2006 19:43:49 -0000 1.278 *************** *** 540,544 **** mkdir -p $LFS/dev/pts mkdir -p $LFS/proc ! mkdir -p $LFS/usr/src/{cache,config,doc,html,langs,lfs,log,src,ccache,distcc} mkdir -p $LFS/{$INSTALLER_DIR,$OPT_DIR,usr/local/{ccache,distcc}} --- 540,544 ---- mkdir -p $LFS/dev/pts mkdir -p $LFS/proc ! mkdir -p $LFS/usr/src/{cache,config,doc,html,langs,lfs,log_${MACHINE}_${USE_LIBC},src,ccache,distcc} mkdir -p $LFS/{$INSTALLER_DIR,$OPT_DIR,usr/local/{ccache,distcc}} *************** *** 559,563 **** mount --bind $BASEDIR/langs $LFS/usr/src/langs mount --bind $BASEDIR/lfs $LFS/usr/src/lfs ! mount --bind $BASEDIR/log_${MACHINE}_${USE_LIBC} $LFS/usr/src/log mount --bind $BASEDIR/src $LFS/usr/src/src mount --bind $BASEDIR/build_${MACHINE}_${USE_LIBC}/$TOOLS_DIR $LFS/$TOOLS_DIR --- 559,563 ---- mount --bind $BASEDIR/langs $LFS/usr/src/langs mount --bind $BASEDIR/lfs $LFS/usr/src/lfs ! mount --bind $BASEDIR/log_${MACHINE}_${USE_LIBC} $LFS/usr/src/log_${MACHINE}_${USE_LIBC} mount --bind $BASEDIR/src $LFS/usr/src/src mount --bind $BASEDIR/build_${MACHINE}_${USE_LIBC}/$TOOLS_DIR $LFS/$TOOLS_DIR *************** *** 1290,1294 **** { LOGFILE="$BASEDIR/log_${MACHINE}_${USE_LIBC}/_build.packages.log" ! LOGFILE_CHROOT="/usr/src/log/_build.packages.log" export LOGFILE LOGFILE_CHROOT echo "... see detailed log in _build.*.log files" >> $LOGFILE --- 1290,1294 ---- { LOGFILE="$BASEDIR/log_${MACHINE}_${USE_LIBC}/_build.packages.log" ! LOGFILE_CHROOT="/usr/src/log_${MACHINE}_${USE_LIBC}/_build.packages.log" export LOGFILE LOGFILE_CHROOT echo "... see detailed log in _build.*.log files" >> $LOGFILE |