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

The never ending story of cleaning up CLFS scripts..

Browse source
This commit is contained in:
George Boudreau 2006-07-04 02:02:48 +00:00
parent 483ab89128
commit 7eb9402d4d
2 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CLFS/master.sh
View file

@ -442,7 +442,7 @@ bm_testsuite_tools_Makefiles() { #
#
# Drop in the name of the target on a new line, and the previous target
# as a dependency. Also call the echo_message function.
wrt_target "${this_script}" "$PREV"
wrt_target_boot "${this_script}" "$PREV"
#
wrt_unpack3 "$pkg_tarball"
[[ "$OPTIMIZE" = "2" ]] && wrt_optimize "$name" && wrt_makeflags "$name"
@ -647,7 +647,7 @@ bm_final_system_Makefiles() { #
#
# Drop in the name of the target on a new line, and the previous target
# as a dependency. Also call the echo_message function.
wrt_target "${this_script}${N}" "$PREV"
wrt_target_boot "${this_script}${N}" "$PREV"
# If $pkg_tarball isn't empty, we've got a package...
if [ "$pkg_tarball" != "" ] ; then
@ -785,7 +785,7 @@ bm_bootscripts_Makefiles() { #
#
# Drop in the name of the target on a new line, and the previous target
# as a dependency. Also call the echo_message function.
wrt_target "${this_script}" "$PREV"
wrt_target_boot "${this_script}" "$PREV"
#
# If $pkg_tarball isn't empty, we've got a package...
#
@ -926,7 +926,7 @@ bm_bootable_Makefiles() { #
#
# Drop in the name of the target on a new line, and the previous target
# as a dependency. Also call the echo_message function.
wrt_target "${this_script}" "$PREV"
wrt_target_boot "${this_script}" "$PREV"
#
# If $pkg_tarball isn't empty, we've got a package...
# Insert instructions for unpacking the package and changing directories

21
common/common-functions
View file

@ -207,6 +207,27 @@ EOF
) >> $MKFILE.tmp
}
#----------------------------------#
wrt_target_boot() { # Create target and initialize log file
#----------------------------------#
local i=$1
local PREV=$2
case $i in
iteration* ) local LOGFILE=$this_script.log ;;
* ) local LOGFILE=$this_script ;;
esac
(
cat << EOF
$i: $PREV
@\$(call echo_message, Building)
@./progress_bar.sh \$@ &
@echo -e "\n\`date\`\n\nKB: \`du -skx --exclude=${SCRIPT_ROOT}\`\n" >logs/$LOGFILE
EOF
) >> $MKFILE.tmp
}
#----------------------------#
get_package_tarball_name() { #
#----------------------------#