Changeset a0f4b12 for common

Timestamp:

09/16/2006 07:05:45 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

experimental

Children:

6411121

Parents:

3d55f0e

Message:

Fixed ICA/farce runs, I hope.

File:

• common/func_compare.sh (modified) (2 diffs)

common/func_compare.sh

@@ -27 +27 @@
 
   if [[ "$PROGNAME" = "clfs" ]] && [[ "$METHOD" = "chroot" ]] ; then
-    final_system_Makefiles $RUN
+    chroot_final_system_Makefiles $RUN
   elif [[ "$PROGNAME" = "clfs" ]] && [[ "$METHOD" = "boot" ]] ; then
-    bm_final_system_Makefiles $RUN
+    boot_final_system_Makefiles $RUN
   else
     chapter6_Makefiles $RUN
+  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
 
@@ -45 +59 @@
 /sources /root /srv /sys /tmp /tools /usr/local /usr/src /var/log/paco"
 
-  if [[ "$PROGNAME" = "clfs" ]] && [[ "$METHOD" = "boot" ]] ; then
-    local    ROOT_DIR=/
-    local DEST_TOPDIR=/${SCRIPT_ROOT}
-    local   ICALOGDIR=/${SCRIPT_ROOT}/logs/ICA
-    local FARCELOGDIR=/${SCRIPT_ROOT}/logs/farce
-  else
-    local    ROOT_DIR=$BUILDDIR
-    local DEST_TOPDIR=$BUILDDIR/${SCRIPT_ROOT}
-  fi
+  local    ROOT_DIR=/
+  local DEST_TOPDIR=/${SCRIPT_ROOT}
+  local   ICALOGDIR=/${SCRIPT_ROOT}/logs/ICA
+  local FARCELOGDIR=/${SCRIPT_ROOT}/logs/farce
 
   if [[ "$RUN_ICA" = "y" ]] ; then