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

Some comments fixes.

Browse source 
Trailing spaces cleam-up.
Removed obsolete code.
This commit is contained in:
Manuel Canales Esparcia 2006-07-30 08:58:26 +00:00
parent e840d275ce
commit 927254568a
1 changed files with 10 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
HLFS/master.sh
View file

@ -120,7 +120,6 @@ chapter3_Makefiles() { # Initialization of the system
TARGET="pc-linux-gnu"; LOADER="ld-linux.so.2" TARGET="pc-linux-gnu"; LOADER="ld-linux.so.2"
fi fi
# NOTE: We use the hlfs username and groupname also in HLFS
# If /home/hlfs is already present in the host, we asume that the # If /home/hlfs is already present in the host, we asume that the
# hlfs user and group are also presents in the host, and a backup # hlfs user and group are also presents in the host, and a backup
# of their bash init files is made. # of their bash init files is made.
@ -211,8 +210,7 @@ chapter5_Makefiles() { # Bootstrap or temptools phase
# the names of the targets in the Makefile # the names of the targets in the Makefile
chapter5="$chapter5 $this_script" chapter5="$chapter5 $this_script"
# Grab the name of the target (minus the -headers or -cross in the case of gcc # Grab the name of the target
# and binutils in chapter 5)
name=`echo $this_script | sed -e 's@[0-9]\{3\}-@@'` name=`echo $this_script | sed -e 's@[0-9]\{3\}-@@'`
# Adjust 'name' # Adjust 'name'
@ -260,7 +258,6 @@ chapter5_Makefiles() { # Bootstrap or temptools phase
# Remove the build directory(ies) except if the package build fails # Remove the build directory(ies) except if the package build fails
# (so we can review config.cache, config.log, etc.) # (so we can review config.cache, config.log, etc.)
# For Binutils the sources must be retained for some time.
if [ "$pkg_tarball" != "" ] ; then if [ "$pkg_tarball" != "" ] ; then
wrt_remove_build_dirs "$name" wrt_remove_build_dirs "$name"
fi fi
@ -325,14 +322,6 @@ chapter6_Makefiles() { # sysroot or chroot build phase
# Grab the name of the target # Grab the name of the target
name=`echo $this_script | sed -e 's@[0-9]\{3\}-@@'` name=`echo $this_script | sed -e 's@[0-9]\{3\}-@@'`
#
# Sed replacement to fix some rm command that could fail.
# That should be fixed in the book sources.
#
case $name in
glibc) sed 's/rm /rm -f /' -i chapter06$N/$this_script ;;
esac
case $name in case $name in
uclibc) name="uClibc" ;; uclibc) name="uClibc" ;;
esac esac
@ -390,7 +379,7 @@ chapter6_Makefiles() { # sysroot or chroot build phase
[[ "$OPTIMIZE" != "0" ]] && wrt_optimize "$name" && wrt_makeflags "$name" [[ "$OPTIMIZE" != "0" ]] && wrt_optimize "$name" && wrt_makeflags "$name"
fi fi
# In the mount of kernel filesystems we need to set LFS and not to use chroot. # In the mount of kernel filesystems we need to set HLFS and not to use chroot.
case "${this_script}" in case "${this_script}" in
*kernfs*) *kernfs*)
wrt_RunAsRoot "hlfs" "${this_script}" "${file}" wrt_RunAsRoot "hlfs" "${this_script}" "${file}"