Changeset eb024db

Timestamp:

04/11/2006 08:03:19 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

experimental

Children:

d27c9ca

Parents:

a212c80

Message:

Started new method to create iteration Makefile targets.

Files:

• LFS/master.sh (modified) (4 diffs)
• common/func_ICA.sh (modified) (2 diffs)

LFS/master.sh

@@ -156 +156 @@
     case "${this_script}" in
       *chroot)      continue ;;
-      *stripping*) [[ "${STRIP}" = "0" ]] && continue
-                   [[ "${STRIP}" != "0" ]] && [[ "$COMPARE" != "0" ]] && \
-                   system_rebuild="$system_rebuild ${this_script}"
-      ;;
+      *stripping*) [[ "${STRIP}" = "0" ]] && continue ;;
     esac
 
@@ -186 +183 @@
       FILE="$name-$vrs.tar.*"
       wrt_unpack2 "$FILE"
-      # Add it to the system_rebuild target
-      [[ "$COMPARE" != "0" ]] && system_rebuild="$system_rebuild ${this_script}"
     fi
 
@@ -311 +306 @@
   chapter5_Makefiles
   chapter6_Makefiles
+  # Add the ICA/farce targets, if needed
+  [[ "$COMPARE" != "0" ]] && wrt_ica_targets
   chapter789_Makefiles
 
@@ -402 +399 @@
 ) >> $MKFILE
 
-  # Add the ICA/farce targets
-  [[ "$COMPARE" != "0" ]] && wrt_ica_targets "$system_rebuild"
-
   # Bring over the items from the Makefile.tmp
   cat $MKFILE.tmp >> $MKFILE

common/func_ICA.sh

@@ -4 +4 @@
 wrt_ica_targets() {                #
 #----------------------------------#
-  local system_rebuild=$1
-  wrt_system_rebuild "$system_rebuild"
-  wrt_iterations     "$system_rebuild"
-}
-
-#----------------------------------#
-wrt_system_rebuild() {                #
-#----------------------------------#
-  local system_rebuild=$1
-(
-    cat << EOF
-system_rebuild:  $system_rebuild
-
-EOF
-) >> $MKFILE
-}
-
-#----------------------------------#
-wrt_iterations() {                 #
-#----------------------------------#
-  local system_rebuild=$1
 
   for ((N=1; N <= ITERATIONS ; N++)) ; do # Double parentheses,
@@ -32 +11 @@
       echo "$ITERATION:  chapter6" >> $MKFILE
       echo -e "\t@\$(call echo_message, Building)" >> $MKFILE
-      wrt_prepare        "$ITERATION"
+      wrt_ica_work       "$ITERATION"
       wrt_logs_and_clean "$ITERATION"
-      PREV=$ITERATION
-    elif [ "$N" = "$ITERATIONS" ] ; then
-      echo "iteration-last:  $PREV  system_rebuild" >> $MKFILE
+    else
+      wrt_system_build $N
+      echo "iteration-last:  $PREV  system_build_$N" >> $MKFILE
       echo -e "\t@\$(call echo_message, Building)" >> $MKFILE
-      wrt_prepare        "$ITERATION" "$PREV"
-      wrt_logs           "$ITERATION"
-    else
-      echo "$ITERATION:  $PREV  system_rebuild" >> $MKFILE
-      echo -e "\t@\$(call echo_message, Building)" >> $MKFILE
-      wrt_prepare        "$ITERATION" "$PREV"
-      wrt_logs_and_clean "$ITERATION"
-      PREV=$ITERATION
+      wrt_ica_work       "$ITERATION" "$PREV"
+      if [ "$N" = "$ITERATIONS" ] ; then
+        wrt_logs           "$ITERATION"
+      else
+        wrt_logs_and_clean "$ITERATION"
+      fi
     fi
+    PREV=$ITERATION
   done
 }
 
 #----------------------------------#
-wrt_prepare() {                    #
+wrt_system_build() {               #
+#----------------------------------#
+  local RUN=$1
+
+  # Placeholder for now
+}
+
+#----------------------------------#
+wrt_ica_work() {                   #
 #----------------------------------#
   local ITERATION=$1