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

Cosmetic only

Browse source
This commit is contained in:
George Boudreau 2006-03-17 15:39:20 +00:00
parent c0613fec4c
commit e10232b5c4
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
HLFS/master.sh
View file

@ -98,7 +98,7 @@ chapter4_Makefiles() { # Initialization of the system
#----------------------------# #----------------------------#
local TARGET LOADER local TARGET LOADER
echo "${YELLOW} Processing Chapter-3 scripts ${OFF}" echo "${tab_}${GREEN}Processing... ${L_arrow}Chapter3${R_arrow}"
# Define a few model dependant variables # Define a few model dependant variables
if [[ ${MODEL} = "uclibc" ]]; then if [[ ${MODEL} = "uclibc" ]]; then
@ -169,7 +169,7 @@ chapter5_Makefiles() { # Bootstrap or temptools phase
local file local file
local this_script local this_script
echo "${YELLOW} Processing Chapter-5 scripts${OFF}" echo "${tab_}${GREEN}Processing... ${L_arrow}Chapter5${R_arrow}"
for file in chapter05/* ; do for file in chapter05/* ; do
# Keep the script file name # Keep the script file name
@ -294,6 +294,7 @@ chapter6_Makefiles() { # sysroot or chroot build phase
local file local file
local this_script local this_script
echo "${tab_}${GREEN}Processing... ${L_arrow}Chapter6${R_arrow}"
# #
# Set these definitions early and only once # Set these definitions early and only once
# #
@ -303,7 +304,6 @@ chapter6_Makefiles() { # sysroot or chroot build phase
TARGET="pc-linux-gnu"; LOADER="ld-linux.so.2" TARGET="pc-linux-gnu"; LOADER="ld-linux.so.2"
fi fi
echo -e "${YELLOW} Processing Chapter-6 scripts ${OFF}"
for file in chapter06/* ; do for file in chapter06/* ; do
# Keep the script file name # Keep the script file name
this_script=`basename $file` this_script=`basename $file`
@ -441,7 +441,7 @@ chapter7_Makefiles() { # Create a bootable system.. kernel, bootscripts..e
local file local file
local this_script local this_script
echo "${YELLOW} Processing Chapter-7 scripts ${OFF}" echo "${tab_}${GREEN}Processing... ${L_arrow}Chapter7${R_arrow}"
for file in chapter07/*; do for file in chapter07/*; do
# Keep the script file name # Keep the script file name
this_script=`basename $file` this_script=`basename $file`
@ -555,7 +555,7 @@ EOF
#----------------------------# #----------------------------#
build_Makefile() { # Construct a Makefile from the book scripts build_Makefile() { # Construct a Makefile from the book scripts
#----------------------------# #----------------------------#
echo -e "${GREEN}Creating Makefile... ${OFF}" echo "Creating Makefile... "
cd $JHALFSDIR/${PROGNAME}-commands cd $JHALFSDIR/${PROGNAME}-commands
# Start with a clean Makefile.tmp file # Start with a clean Makefile.tmp file
@ -667,7 +667,7 @@ EOF
# Bring over the items from the Makefile.tmp # Bring over the items from the Makefile.tmp
cat $MKFILE.tmp >> $MKFILE cat $MKFILE.tmp >> $MKFILE
rm $MKFILE.tmp rm $MKFILE.tmp
echo -ne "${GREEN}done\n${OFF}" echo "done"
} }

6
LFS/master.sh
View file

@ -11,7 +11,7 @@
#----------------------------# #----------------------------#
chapter4_Makefiles() { chapter4_Makefiles() {
#----------------------------# #----------------------------#
echo -e "\n${tab_}${GREEN}Processing... ${L_arrow}Chapter4${R_arrow}" echo "${tab_}${GREEN}Processing... ${L_arrow}Chapter4${R_arrow}"
# If /home/lfs is already present in the host, we asume that the # If /home/lfs is already present in the host, we asume that the
# lfs user and group are also presents in the host, and a backup # lfs user and group are also presents in the host, and a backup
@ -294,7 +294,7 @@ chapter789_Makefiles() {
#----------------------------# #----------------------------#
build_Makefile() { build_Makefile() {
#----------------------------# #----------------------------#
echo -n "Creating Makefile... " echo "Creating Makefile... "
cd $JHALFSDIR/${PROGNAME}-commands cd $JHALFSDIR/${PROGNAME}-commands
# Start with a clean Makefile.tmp file # Start with a clean Makefile.tmp file
@ -400,7 +400,7 @@ EOF
# Bring over the items from the Makefile.tmp # Bring over the items from the Makefile.tmp
cat $MKFILE.tmp >> $MKFILE cat $MKFILE.tmp >> $MKFILE
rm $MKFILE.tmp rm $MKFILE.tmp
echo -ne "done\n" echo "done"
} }