zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed ICA/farce runs, I hope.

Browse source
This commit is contained in:
Manuel Canales Esparcia 2006-09-16 19:05:45 +00:00
parent 3d55f0e9f2
commit a0f4b12e49
1 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
common/func_compare.sh
View file

@ -26,13 +26,27 @@ wrt_system_build() { #
local PREV_IT=$2 local PREV_IT=$2
if [[ "$PROGNAME" = "clfs" ]] && [[ "$METHOD" = "chroot" ]] ; then if [[ "$PROGNAME" = "clfs" ]] && [[ "$METHOD" = "chroot" ]] ; then
final_system_Makefiles $RUN chroot_final_system_Makefiles $RUN
elif [[ "$PROGNAME" = "clfs" ]] && [[ "$METHOD" = "boot" ]] ; then elif [[ "$PROGNAME" = "clfs" ]] && [[ "$METHOD" = "boot" ]] ; then
bm_final_system_Makefiles $RUN boot_final_system_Makefiles $RUN
else else
chapter6_Makefiles $RUN chapter6_Makefiles $RUN
fi fi
if [[ "$PROGNAME" = "clfs" ]] ; then
basicsystem="$basicsystem $PREV_IT $system_build"
else
chapter6="$chapter6 $PREV_IT $system_build"
fi
if [[ "$RUN" = "$ITERATIONS" ]] ; then
if [[ "$PROGNAME" = "clfs" ]] ; then
basicsystem="$basicsystem iteration-$RUN"
else
chapter6="$chapter6 iteration-$RUN"
fi
fi
echo -e "\nsystem_build_$RUN: $PREV_IT $system_build" >> $MKFILE.tmp echo -e "\nsystem_build_$RUN: $PREV_IT $system_build" >> $MKFILE.tmp
} }
@ -44,15 +58,10 @@ wrt_compare_work() { #
local PRUNEPATH="/dev /home /${SCRIPT_ROOT} /lost+found /media /mnt /opt /proc \ local PRUNEPATH="/dev /home /${SCRIPT_ROOT} /lost+found /media /mnt /opt /proc \
/sources /root /srv /sys /tmp /tools /usr/local /usr/src /var/log/paco" /sources /root /srv /sys /tmp /tools /usr/local /usr/src /var/log/paco"
if [[ "$PROGNAME" = "clfs" ]] && [[ "$METHOD" = "boot" ]] ; then local ROOT_DIR=/
local ROOT_DIR=/ local DEST_TOPDIR=/${SCRIPT_ROOT}
local DEST_TOPDIR=/${SCRIPT_ROOT} local ICALOGDIR=/${SCRIPT_ROOT}/logs/ICA
local ICALOGDIR=/${SCRIPT_ROOT}/logs/ICA local FARCELOGDIR=/${SCRIPT_ROOT}/logs/farce
local FARCELOGDIR=/${SCRIPT_ROOT}/logs/farce
else
local ROOT_DIR=$BUILDDIR
local DEST_TOPDIR=$BUILDDIR/${SCRIPT_ROOT}
fi
if [[ "$RUN_ICA" = "y" ]] ; then if [[ "$RUN_ICA" = "y" ]] ; then
local DEST_ICA=$DEST_TOPDIR/ICA && \ local DEST_ICA=$DEST_TOPDIR/ICA && \