Changeset 3da8c49 for common/libs/func_compare.sh

Timestamp:

06/14/2020 07:08:19 AM (4 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

ablfs-more, legacy, trunk

Children:

cce9c16

Parents:

b33c6ee

Message:

Update ICA for new LFS/master.sh

File:

• common/libs/func_compare.sh (modified) (6 diffs)

common/libs/func_compare.sh

@@ -9 +9 @@
     ITERATION=iteration-$N
     if [ "$N" != "1" ] ; then
-      wrt_system_build "$N" "$PREV_IT"
+      wrt_system_build "$1" "$N" "$PREV_IT"
     fi
+    # add needed Makefile target
     this_script=$ITERATION
     CHROOT_wrt_target "$ITERATION" "$PREV"
@@ -19 +20 @@
     PREV=$ITERATION
   done
+  # We need to prevent "userdel" in all iterations but the last
+  # We need to access the scriptlets in "dir"
+  local dir
+  printf -v dir chapter%02d "$1"
+
+  sed -i '/userdel/d' $dir/*revised*
+  for (( N = 2; N < ITERATIONS; N++ )); do
+     sed -i '/userdel/d' $dir-build_$N/*revised*
+  done
+
 }
 
@@ -24 +35 @@
 wrt_system_build() {               #
 #----------------------------------#
-  local     RUN=$1
-  local PREV_IT=$2
+  local    CHAP=$1
+  local     RUN=$2
+  local PREV_IT=$3
 
   if [[ "$PROGNAME" = "clfs" ]] ; then
     final_system_Makefiles $RUN
   else
-    chapter6_Makefiles $RUN
+    chapter_targets $CHAP $RUN
   fi
 
@@ -36 +48 @@
     basicsystem="$basicsystem $PREV_IT $system_build"
   else
-    chapter6="$chapter6 $PREV_IT $system_build"
+    CHROOT_TGT="$CHROOT_TGT $PREV_IT $system_build"
   fi
 
@@ -43 +55 @@
       basicsystem="$basicsystem iteration-$RUN"
     else
-      chapter6="$chapter6 iteration-$RUN"
+      CHROOT_TGT="$CHROOT_TGT iteration-$RUN"
     fi
   fi
@@ -74 +86 @@
     fi
   fi
-
 }