Changeset fb68d23 for LFS

Timestamp:

04/09/2006 11:22:51 AM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

experimental

Children:

97520c9

Parents:

02d1ae7

Message:

Added COMPARE config option to avoid to have to test if RUN_ICA or RUN_FARCE are set.
Changed ICA_rebuild by system_rebuild.

File:

• LFS/master.sh (modified) (4 diffs)

LFS/master.sh

@@ -157 +157 @@
       *chroot)      continue ;;
       *stripping*) [[ "${STRIP}" = "0" ]] && continue
-                   [[ "${STRIP}" != "0" ]] && [[ "$RUN_ICA" != "0" ]] && \
-                   ICA_rebuild="$ICA_rebuild ${this_script}"
+                   [[ "${STRIP}" != "0" ]] && [[ "$COMPARE" != "0" ]] && \
+                   system_rebuild="$system_rebuild ${this_script}"
       ;;
     esac
@@ -186 +186 @@
       FILE="$name-$vrs.tar.*"
       wrt_unpack2 "$FILE"
-      # Add it to the ICA_rebuild target
-      [[ "$RUN_ICA" != "0" ]] && ICA_rebuild="$ICA_rebuild ${this_script}"
+      # Add it to the system_rebuild target
+      [[ "$COMPARE" != "0" ]] && system_rebuild="$system_rebuild ${this_script}"
     fi
 
@@ -220 +220 @@
   echo "${tab_}${GREEN}Processing... ${L_arrow}Chapter7/8/9${R_arrow}"
 
-  # Reset $PREV for ICA runs
-  [[ "$RUN_ICA" != "0" ]] && PREV=iteration-last
+  # Reset $PREV for ICA/farce runs
+  [[ "$COMPARE" != "0" ]] && PREV=iteration-last
 
   for file in chapter0{7,8,9}/* ; do
@@ -402 +402 @@
 ) >> $MKFILE
 
-  # Add the ICA targets
-  [[ "$RUN_ICA" != "0" ]] && wrt_ica_targets "$ICA_rebuild"
+  # Add the ICA/farce targets
+  [[ "$COMPARE" != "0" ]] && wrt_ica_targets "$system_rebuild"
 
   # Bring over the items from the Makefile.tmp