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

Minor formatting changes for consistency and a typo fix in the README.

Browse source
This commit is contained in:
Jeremy Huntwork 2007-03-21 02:34:14 +00:00
parent c180dec974
commit b11c10be50
3 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
LFS/master.sh
View file

@ -276,7 +276,7 @@ chapter6_Makefiles() {
#----------------------------# #----------------------------#
chapter78_Makefiles() { chapter78_Makefiles() {
#----------------------------# #----------------------------#
echo "${tab_}${GREEN}Processing... ${L_arrow}Chapter7/8 ( BOOT ) ${R_arrow}" echo "${tab_}${GREEN}Processing... ${L_arrow}Chapter7/8 ( BOOT ) ${R_arrow}"
for file in chapter0{7,8}/* ; do for file in chapter0{7,8}/* ; do
# Keep the script file name # Keep the script file name

2
README
View file

@ -234,7 +234,7 @@ $Id$
Q. "What is the function of "User account" and "Group account" menu settings?" Q. "What is the function of "User account" and "Group account" menu settings?"
A. If you are running jhalfs from a low or non-privileged account you may not A. If you are running jhalfs from a low or non-privileged account you may not
have the priv to create/delete the user needed to build temporally tools. have the priv to create/delete the user needed to build temporary tools.
These settings allow you to use your own user and group name to do that These settings allow you to use your own user and group name to do that
build steps. build steps.

20
common/libs/func_book_parser
View file

@ -83,7 +83,7 @@ extract_commands() { #
# Dump the commands in shell script form from the HLFS book. # Dump the commands in shell script form from the HLFS book.
case ${PROGNAME} in case ${PROGNAME} in
clfs) clfs)
echo -n " ${L_arrow}${BOLD}$ARCH${R_arrow} target architecture" echo -n " ${L_arrow}${BOLD}$ARCH${R_arrow} target architecture... "
xsltproc --nonet \ xsltproc --nonet \
--xinclude \ --xinclude \
--stringparam method $METHOD \ --stringparam method $METHOD \
@ -97,7 +97,7 @@ extract_commands() { #
;; ;;
clfs2) clfs2)
echo -n " ${L_arrow}${BOLD}$ARCH${R_arrow} target architecture" echo -n " ${L_arrow}${BOLD}$ARCH${R_arrow} target architecture... "
xsltproc --nonet \ xsltproc --nonet \
--xinclude \ --xinclude \
--stringparam vim-lang $VIMLANG \ --stringparam vim-lang $VIMLANG \
@ -108,7 +108,7 @@ extract_commands() { #
;; ;;
clfs3) clfs3)
echo -n " ${L_arrow}${BOLD}$ARCH${R_arrow} target architecture" echo -n " ${L_arrow}${BOLD}$ARCH${R_arrow} target architecture... "
xsltproc --nonet \ xsltproc --nonet \
--xinclude \ --xinclude \
--stringparam vim-lang $VIMLANG \ --stringparam vim-lang $VIMLANG \
@ -119,7 +119,7 @@ extract_commands() { #
;; ;;
hlfs) hlfs)
echo -n " ${L_arrow}${BOLD}$MODEL${R_arrow} HLFS libc implementation" echo -n " ${L_arrow}${BOLD}$MODEL${R_arrow} HLFS libc implementation... "
xsltproc --nonet \ xsltproc --nonet \
--xinclude \ --xinclude \
--stringparam model $MODEL \ --stringparam model $MODEL \
@ -133,7 +133,7 @@ extract_commands() { #
-o ./${PROGNAME}-commands/ $XSL $BOOK/index.xml >>$LOGDIR/$LOG 2>&1 -o ./${PROGNAME}-commands/ $XSL $BOOK/index.xml >>$LOGDIR/$LOG 2>&1
;; ;;
lfs) lfs)
echo -n " ${L_arrow}${BOLD}LFS${R_arrow} build" echo -n " ${L_arrow}${BOLD}LFS${R_arrow} build... "
xsltproc --nonet \ xsltproc --nonet \
--xinclude \ --xinclude \
--stringparam testsuite $TEST \ --stringparam testsuite $TEST \
@ -144,13 +144,13 @@ extract_commands() { #
--stringparam lang $LANG \ --stringparam lang $LANG \
-o ./${PROGNAME}-commands/ $XSL $BOOK/index.xml >>$LOGDIR/$LOG 2>&1 -o ./${PROGNAME}-commands/ $XSL $BOOK/index.xml >>$LOGDIR/$LOG 2>&1
;; ;;
*) echo -n " ${L_arrow}${BOLD}${PROGNAME}${R_arrow} book invalid, terminate build" *) echo -n " ${L_arrow}${BOLD}${PROGNAME}${R_arrow} book invalid, terminate build... "
exit 1 ;; exit 1 ;;
esac esac
[[ "${BLFS_TOOL}" = "y" ]] && copy_blfs_deps_scripts [[ "${BLFS_TOOL}" = "y" ]] && copy_blfs_deps_scripts
echo " ...OK" echo "done"
# Make the scripts executable. # Make the scripts executable.
chmod -R +x $JHALFSDIR/${PROGNAME}-commands chmod -R +x $JHALFSDIR/${PROGNAME}-commands
@ -169,7 +169,9 @@ create_package_list() { #
# Create the packages file. We need it for proper Makefile creation # Create the packages file. We need it for proper Makefile creation
rm -f pkg_tarball_list rm -f pkg_tarball_list
echo -n "Creating <${PROGNAME}> list of tarball names for $BOOK $ARCH" echo -n "Creating <${PROGNAME}> list of tarball names for $BOOK"
if [ ! -z $ARCH ] ; then echo -n " $ARCH" ; fi
echo -n "... "
case ${PROGNAME} in case ${PROGNAME} in
clfs | clfs2 | clfs3 ) clfs | clfs2 | clfs3 )
xsltproc --nonet --xinclude -o pkg_tarball_list packages.xsl \ xsltproc --nonet --xinclude -o pkg_tarball_list packages.xsl \
@ -203,7 +205,7 @@ EOF
) >> pkg_tarball_list ) >> pkg_tarball_list
fi fi
echo " ...OK" echo "done"
} }