Changeset 4384929 for CLFS

Timestamp:

01/21/2014 09:36:12 PM (10 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

2.4, ablfs-more, legacy, new_features, trunk

Children:

2270ffd

Parents:

b97ed5b

Message:

Avoid clobbering suffixes like "-64bit" or "-n32" from install-logs names
in CLFS/master.sh. Reported by W. Harrington. Thanks.
Also correct a bug: log_new_files was called instead of touch_time_stamp.

File:

• CLFS/master.sh (modified) (10 diffs)

CLFS/master.sh

@@ -513 +513 @@
 
     # Test if the stripping phase must be skipped.
-    # Skip alsp temp-perl for iterative runs
+    # Skip also temp-perl for iterative runs
     case $this_script in
       *stripping*) [[ "$STRIP" = "n" ]] && continue ;;
@@ -519 +519 @@
     esac
 
-    # Grab the name of the target, strip id number, XXX-script
-    name=`echo $this_script | sed -e 's@[0-9]\{3\}-@@' \
-                                  -e 's@temp-@@' \
-                                  -e 's@-64bit@@' \
-                                  -e 's@-64@@' \
-                                  -e 's@64@@' \
-                                  -e 's@n32@@' \
-                                  -e 's,'$N',,'`
+    # Grab the name of the target, strip id number, XXX-script.
+    # name1 is partially stripped and should be used for logging files.
+    # name is completely stripped and is used for grabbing
+    # the package name.
+    name1=`echo $this_script | sed -e 's@[0-9]\{3\}-@@' \
+                                   -e 's,'$N',,'`
+    name=`echo $name1 | sed -e 's@temp-@@' \
+                            -e 's@-64bit@@' \
+                            -e 's@-64@@' \
+                            -e 's@64@@' \
+                            -e 's@n32@@'`
 
     # Find the version of the command files, if it corresponds with the building of
@@ -580 +583 @@
       CHROOT_wrt_RemoveBuildDirs "$name"
       if [ "${INSTALL_LOG}" = "y" ] && [ "x${N}" = "x" ] ; then
-        CHROOT_wrt_LogNewFiles "$name"
+        CHROOT_wrt_LogNewFiles "$name1"
       fi
     fi
@@ -623 +626 @@
     bootscripttools="$bootscripttools $this_script"
 
-    # Grab the name of the target, strip id number, XXX-script
-    name=`echo $this_script | sed -e 's@[0-9]\{3\}-@@'\
-                                  -e 's@-64bit@@' \
-                                  -e 's@-64@@' \
-                                  -e 's@64@@' \
-                                  -e 's@n32@@'`
+    # Grab the name of the target, strip id number, XXX-script.
+    # name1 is partially stripped and should be used for logging files.
+    # name is completely stripped and is used for grabbing
+    # the package name.
+    name1=`echo $this_script | sed -e 's@[0-9]\{3\}-@@'`
+    name=`echo $name1 | sed -e 's@-64bit@@' \
+                            -e 's@-64@@' \
+                            -e 's@64@@' \
+                            -e 's@n32@@'`
     case $name in
       *bootscripts*) name=bootscripts-cross-lfs ;;
@@ -648 +654 @@
     if [ "$pkg_tarball" != "" ] ; then
       if [ "${INSTALL_LOG}" = "y" ] ; then
-        CHROOT_wrt_LogNewFiles "$name"
+        CHROOT_wrt_TouchTimestamp
       fi
       CHROOT_Unpack "$pkg_tarball"
@@ -660 +666 @@
       CHROOT_wrt_RemoveBuildDirs "$name"
       if [ "${INSTALL_LOG}" = "y" ] ; then
-        CHROOT_wrt_LogNewFiles "$name"
+        CHROOT_wrt_LogNewFiles "$name1"
       fi
     fi
@@ -703 +709 @@
 
     # Grab the name of the target, strip id number, XXX-script
-    name=`echo $this_script | sed -e 's@[0-9]\{3\}-@@'\
-                                  -e 's@-64bit@@' \
-                                  -e 's@-64@@' \
-                                  -e 's@64@@' \
-                                  -e 's@n32@@'`
+    # name1 is partially stripped and should be used for logging files.
+    # name is completely stripped and is used for grabbing
+    # the package name.
+    name1=`echo $this_script | sed -e 's@[0-9]\{3\}-@@'`
+    name=`echo $name1 | sed -e 's@-64bit@@' \
+                            -e 's@-64@@' \
+                            -e 's@64@@' \
+                            -e 's@n32@@'`
     case $name in
       *network*) name=network-cross-lfs ;;
@@ -726 +735 @@
     if [ "$pkg_tarball" != "" ] ; then
       if [ "${INSTALL_LOG}" = "y" ] ; then
-        CHROOT_wrt_LogNewFiles "$name"
+        CHROOT_wrt_TouchTimestamp
       fi
       CHROOT_Unpack "$pkg_tarball"
@@ -738 +747 @@
       CHROOT_wrt_RemoveBuildDirs "$name"
       if [ "${INSTALL_LOG}" = "y" ] ; then
-        CHROOT_wrt_LogNewFiles "$name"
+        CHROOT_wrt_LogNewFiles "$name1"
       fi
     fi
@@ -807 +816 @@
     if [ "$pkg_tarball" != "" ] ; then
       if [ "${INSTALL_LOG}" = "y" ] ; then
-        CHROOT_wrt_LogNewFiles "$name"
+        CHROOT_wrt_TouchTimestamp
       fi
       CHROOT_Unpack "$pkg_tarball"