Author: pierre
Date: Thu Apr 2 02:56:51 2020
New Revision: 4150
Log:
Various fixes for ICA
Modified:
jhalfs/trunk/LFS/master.sh
jhalfs/trunk/common/libs/func_compare.sh
jhalfs/trunk/extras/do_ica_prep
Modified: jhalfs/trunk/LFS/master.sh
==============================================================================
--- jhalfs/trunk/LFS/master.sh Wed Apr 1 02:14:14 2020 (r4149)
+++ jhalfs/trunk/LFS/master.sh Thu Apr 2 02:56:51 2020 (r4150)
@@ -225,7 +225,10 @@
# chapter 6. Note that this Makefile_target business is not really needed here
# but we do it to have a similar structure to chapter 5 (we may merge all
# those functions at some point).
- Makefile_target=runasroot
+ case "$N" in
+ -build*) Makefile_target=chapter6 ;;
+ *) Makefile_target=runasroot ;;
+ esac
# Start loop
for file in chapter06$N/* ; do
@@ -317,8 +320,13 @@
# Keep the script file name for Makefile dependencies.
PREV=${this_script}
# Set system_build envar for iteration targets
- system_build=$chapter6
+ if [ -z "$N" ]; then
+ system_build="$system_build $this_script"
+ fi
done # end for file in chapter06/*
+ if [ -n "$N" ]; then
+ system_build="$chapter6"
+ fi
}
#----------------------------#
Modified: jhalfs/trunk/common/libs/func_compare.sh
==============================================================================
--- jhalfs/trunk/common/libs/func_compare.sh Wed Apr 1 02:14:14 2020
(r4149)
+++ jhalfs/trunk/common/libs/func_compare.sh Thu Apr 2 02:56:51 2020
(r4150)
@@ -96,7 +96,7 @@
for file in \`ls .\` ; do \\
mv -f \$\$file \`echo \$\$file | sed -e 's,-$build,,'\` ; \\
done ; \\
- fi ;
+ fi
@cd /\$(SCRIPT_ROOT)
@if [ -d test-logs ] ; then \\
cd test-logs && \\
Modified: jhalfs/trunk/extras/do_ica_prep
==============================================================================
--- jhalfs/trunk/extras/do_ica_prep Wed Apr 1 02:14:14 2020 (r4149)
+++ jhalfs/trunk/extras/do_ica_prep Thu Apr 2 02:56:51 2020 (r4150)
@@ -43,9 +43,9 @@
# hackery to allow easy diffing. Essentially, replace each
# archive with a dir of the same name and extract the object
# files from the archive into this dir. Despite their names,
- # libieee.a & libmcheck.a are not actual ar archives.
+ # libm.a & libmcheck.a are not actual ar archives.
echo -n "Extracting object files from \".a\" files in ${CMP_DIR}... "
- L=$(find $CMP_DIR -name '*.a' ! -name 'libieee.a' ! -name 'libmcheck.a')
+ L=$(find $CMP_DIR -name '*.a' ! -name 'libm.a' ! -name 'libmcheck.a')
for F in $L; do
mv $F ${F}.XX
mkdir $F
--
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page
