zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Various fixes for ICA

Browse source
This commit is contained in:
Pierre Labastie 2020-04-02 09:56:51 +00:00
parent 0a577f5575
commit 7b7b5e9624
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
LFS/master.sh
View file

@ -225,7 +225,10 @@ chapter6_Makefiles() {
# chapter 6. Note that this Makefile_target business is not really needed here # 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 # but we do it to have a similar structure to chapter 5 (we may merge all
# those functions at some point). # those functions at some point).
Makefile_target=runasroot case "$N" in
-build*) Makefile_target=chapter6 ;;
*) Makefile_target=runasroot ;;
esac
# Start loop # Start loop
for file in chapter06$N/* ; do for file in chapter06$N/* ; do
@ -317,8 +320,13 @@ chapter6_Makefiles() {
# Keep the script file name for Makefile dependencies. # Keep the script file name for Makefile dependencies.
PREV=${this_script} PREV=${this_script}
# Set system_build envar for iteration targets # 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/* done # end for file in chapter06/*
if [ -n "$N" ]; then
system_build="$chapter6"
fi
} }
#----------------------------# #----------------------------#

2
common/libs/func_compare.sh
View file

@ -96,7 +96,7 @@ wrt_logs() { #
for file in \`ls .\` ; do \\ for file in \`ls .\` ; do \\
mv -f \$\$file \`echo \$\$file | sed -e 's,-$build,,'\` ; \\ mv -f \$\$file \`echo \$\$file | sed -e 's,-$build,,'\` ; \\
done ; \\ done ; \\
fi ; fi
@cd /\$(SCRIPT_ROOT) @cd /\$(SCRIPT_ROOT)
@if [ -d test-logs ] ; then \\ @if [ -d test-logs ] ; then \\
cd test-logs && \\ cd test-logs && \\

4
extras/do_ica_prep
View file

@ -43,9 +43,9 @@ if [ ! -f "$CMP_DIR/icaprep" ]; then
# hackery to allow easy diffing. Essentially, replace each # hackery to allow easy diffing. Essentially, replace each
# archive with a dir of the same name and extract the object # archive with a dir of the same name and extract the object
# files from the archive into this dir. Despite their names, # 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}... " 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 for F in $L; do
mv $F ${F}.XX mv $F ${F}.XX
mkdir $F mkdir $F