Changeset aa08925

Timestamp:

04/12/2006 07:38:42 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

experimental

Children:

b242136

Parents:

d80021c3

Message:

Generating truly separate sets of final system packages targets.

Files:

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

LFS/master.sh

@@ -146 +146 @@
 chapter6_Makefiles() {
 #----------------------------#
-  echo "${tab_}${GREEN}Processing... ${L_arrow}Chapter6${R_arrow}"
+  # Set N and chapter6 for iteration targets
+  if [[ -z $1 ]] ; then
+    local N=""
+  else
+    local N=-build_$1
+    local chapter6=""
+  fi
+
+  echo "${tab_}${GREEN}Processing... ${L_arrow}Chapter6$N${R_arrow}"
 
   for file in chapter06/* ; do
@@ -161 +169 @@
     # First append each name of the script files to a list (this will become
     # the names of the targets in the Makefile
-    chapter6="$chapter6 ${this_script}"
+    chapter6="$chapter6 ${this_script}${N}"
 
     # Grab the name of the target
@@ -172 +180 @@
     # Drop in the name of the target on a new line, and the previous target
     # as a dependency. Also call the echo_message function.
-    wrt_target "${this_script}" "$PREV"
+    wrt_target "${this_script}${N}" "$PREV"
 
     # Find the version of the command files, if it corresponds with the building of
@@ -206 +214 @@
 
     # Keep the script file name for Makefile dependencies.
-    PREV=${this_script}
+    PREV=${this_script}${N}
+    # Set system_build envar for iteration targets
+    system_build=$chapter6
   done # end for file in chapter06/*
 }

common/func_compare.sh

@@ -9 +9 @@
     ITERATION=iteration-$N
     if [ "$N" != "1" ] ; then
-      wrt_system_build "$N"
+      wrt_system_build "$N" "$PREV_IT"
     fi
     wrt_target "$ITERATION" "$PREV"
@@ -22 +22 @@
 wrt_system_build() {               #
 #----------------------------------#
-  local RUN=$1
-
-  echo "system_build_$N: $PREV $chapter6" >> $MKFILE.tmp
+  local     RUN=$1
+  local PREV_IT=$2
 
   if [[ "$PROGNAME" = "clfs" ]] && [[ "$METHOD" = "chroot" ]] ; then
@@ -33 +32 @@
     chapter6_Makefiles $RUN
   fi
+
+  echo -e "\nsystem_build_$RUN: $PREV_IT $system_build" >> $MKFILE.tmp
+  PREV=system_build_$RUN
 
 }
@@ -107 +109 @@
         @pushd logs && \\
         mkdir $ITERATION && \\
-        cp ${chapter6}-$N $ITERATION && \\
+        cp ${system_build} $ITERATION && \\
         popd
         @touch \$@
-
 EOF
 ) >> $MKFILE.tmp