Changeset 706e5bf for LFS

Timestamp:

06/20/2020 05:01:23 PM (4 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

ablfs-more, legacy, trunk

Children:

13e52a5

Parents:

7b33f40

Message:

Various small fixes/improvements:

• Prefer SysV over Sys V in Config.in
• do not generate the package list for lfs, it is not needed anymore
• prevent an (ignored) error in LFS/master.sh
• log new files under the scriptlet name (allows to log files for the same package from different builds)
• keep the full name in log_new_file functions (fix a undetected bug in CLFS/HLFS)

File:

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

LFS/master.sh

@@ -71 +71 @@
     esac
     # Grab the name of the target
+    # This is only use to check the name in "opt_override" or "BLACKIST"
     name=`echo ${this_script} | sed -e 's@[0-9]\{3,4\}-@@' \
                                     -e 's@-pass[0-9]\{1\}@@' \
                                     -e 's@-libstdc++@@' \
-                                    -e 's,'$N',,'`
+                                    -e 's,'$N',,' \
+                                    -e 's@-32@@'`
 
     # Find the name of the tarball and the version of the package
@@ -193 +195 @@
          (( 1+nb_chaps <= $1 )) &&
          [ "x${N}" = "x" ] ; then
-        CHROOT_wrt_LogNewFiles "$name"
+        CHROOT_wrt_LogNewFiles "${this_script}"
       fi
     fi
@@ -486 +488 @@
 
 do_housekeeping:
-        @-rm /tools
+        @-rm -f /tools
 
 EOF