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

Merged r2838 from trunk: spelling fixes pointed by Chris Staub.

Browse source
This commit is contained in:
Manuel Canales Esparcia 2006-07-24 18:43:48 +00:00
parent bae64d8dae
commit 95a954c087
6 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
LFS/config
View file

@ -13,7 +13,7 @@ FSTAB=
# If no config file is specified the kernel is NOT compiled # If no config file is specified the kernel is NOT compiled
CONFIG= CONFIG=
# Get the kernel package and patches even if no configutation file # Get the kernel package and patches even if no configuration file
# has been supplied? 0(no)/1(yes) # has been supplied? 0(no)/1(yes)
GETKERNEL=0 GETKERNEL=0

10
README
View file

@ -74,7 +74,7 @@ $Id$
# This points to a local archive of existing packages. If the version in # This points to a local archive of existing packages. If the version in
the archive is incorrect jhalfs will access the net and download the the archive is incorrect jhalfs will access the net and download the
necessary version and store it here for later use. DO NOT set this to necessary version and store it here for later use. DO NOT set this to
$BUILDDIR/sources. If you do not set this variable to a valide directory $BUILDDIR/sources. If you do not set this variable to a valid directory
ALL package tarballs will be downloaded from the 'net. ALL package tarballs will be downloaded from the 'net.
-D /mnt/partition4 -D /mnt/partition4
@ -148,9 +148,9 @@ $Id$
latest version of jhalfs to see if that solves your problem. latest version of jhalfs to see if that solves your problem.
Q. "How do I specify the build location?" Q. "How do I specify the build location?"
A. The original LFS document worked against the well know location /mnt/lfs. A. The original LFS document worked against the well known location /mnt/lfs.
This script automates the build of all of the LFS series of books and uses This script automates the build of all of the LFS series of books and uses
a generic location $BUILDDIR with a default value a /mnt/build_dir. a generic location $BUILDDIR with a default value of /mnt/build_dir.
You may change this value to suit your needs. You may change this value to suit your needs.
The layout below $BUILDDIR is as follows. The layout below $BUILDDIR is as follows.
@ -175,7 +175,7 @@ $Id$
A. The best way to set the value of SRC_ARCHIVE is A. The best way to set the value of SRC_ARCHIVE is
export SRC_ARCHIVE=/wherever/you/store/downloaded/packages export SRC_ARCHIVE=/wherever/you/store/downloaded/packages
OR OR
you can change the setting in .common/config. you can change the setting in common/config.
Q. "Why have 2 copies of the files?" Q. "Why have 2 copies of the files?"
A. The package files must be visible during the chroot phase and this is a A. The package files must be visible during the chroot phase and this is a
@ -194,7 +194,7 @@ $Id$
only the temptools phase. You must run ./clfs using the 'boot' method and only the temptools phase. You must run ./clfs using the 'boot' method and
not the 'chroot.' You must transfer the toolchain to a sparc platform, reboot not the 'chroot.' You must transfer the toolchain to a sparc platform, reboot
the sparc box and continue the build. the sparc box and continue the build.
Of all the LFS series of books the Cross-LFS requires the greatest Of all the LFS series of books Cross-LFS requires the greatest
understanding of host/target hardware combination. Please read the book understanding of host/target hardware combination. Please read the book
carefully and don't skip the easy parts (there are none..) carefully and don't skip the easy parts (there are none..)

6
TODO
View file

@ -5,7 +5,7 @@
MASTER SCRIPT MASTER SCRIPT
------------- -------------
- The BLFS moudule should can be called in conjunction with any of - The BLFS module should be called in conjunction with any of
LFS, CLFS or HLFS modules. LFS, CLFS or HLFS modules.
Before working on that we need to fix the BLFS support. Before working on that we need to fix the BLFS support.
@ -31,9 +31,9 @@ BLFS MODULE (See BLFS/TODO)
OTHERS OTHERS
------ ------
- Add a Cunstomization file discussing how to hack the generated scripts - Add a Customization file discussing how to hack the generated scripts
and Makefiles, using the Cracklib support for Shadow in LFS as an example. and Makefiles, using the Cracklib support for Shadow in LFS as an example.
NOTE: that could require an special command line switch to regenerate the NOTE: that could require a special command line switch to regenerate the
Makefile if additional scripts are manually added to the *-commands/*/ dirs. Makefile if additional scripts are manually added to the *-commands/*/ dirs.
- To create a script to install jhalfs system-wide, if possible. - To create a script to install jhalfs system-wide, if possible.

12
common/common-functions
View file

@ -56,7 +56,7 @@ ${BOLD} -B, --book VER${OFF}
dev*, trunk, SVN = aliases for the Development version of {C,H}LFS dev*, trunk, SVN = aliases for the Development version of {C,H}LFS
branch-NAME = a branch of name NAME branch-NAME = a branch of name NAME
VERSION = the version of a stable released book VERSION = the version of a stable released book
To know what branches and stable books works with this version of jhalfs To know what branches and stable books work with this version of jhalfs
please see http://wiki.linuxfromscratch.org/alfs/wiki/SupportedBooks please see http://wiki.linuxfromscratch.org/alfs/wiki/SupportedBooks
${BOLD} -D --directory DIR${OFF} ${BOLD} -D --directory DIR${OFF}
@ -87,14 +87,14 @@ ${BOLD} -T, --testsuites N ${OFF}
${BOLD} -W, --working-copy DIR${OFF} ${BOLD} -W, --working-copy DIR${OFF}
use the local working copy placed in DIR as the $(echo $PROGNAME | tr [a-z] [A-Z]) book use the local working copy placed in DIR as the $(echo $PROGNAME | tr [a-z] [A-Z]) book
${BOLD} -C, --comparasion TYPE${OFF} ${BOLD} -C, --comparison TYPE${OFF}
do iterative comparison analysis. This extends the total build time do iterative comparison analysis. This extends the total build time
considerably because the entire final system will rebuild itself considerably because the entire final system will rebuild itself
the number of times specified by ITERATIONS in common/config. the number of times specified by ITERATIONS in common/config.
Types allowed are: Types allowed are:
ICA = do ICA as designed by Greg Schafer ICA = do ICA as designed by Greg Schafer
farce = do the farce analysis designed by Ken Moffat farce = do the farce analysis designed by Ken Moffat
both = perfom both ICA and farce analysis both = perform both ICA and farce analysis
${BOLD} -F, --fstab FILE${OFF} ${BOLD} -F, --fstab FILE${OFF}
use FILE as the /etc/fstab file for the ${BOLD}$(echo $PROGNAME | tr [a-z] [A-Z])${OFF} system. If not specified, use FILE as the /etc/fstab file for the ${BOLD}$(echo $PROGNAME | tr [a-z] [A-Z])${OFF} system. If not specified,
@ -108,7 +108,7 @@ ${BOLD} -M, --run-make${OFF}
run make on the generated Makefile run make on the generated Makefile
${BOLD} -R --rebuild${OFF} ${BOLD} -R --rebuild${OFF}
clean the build directory before perfoming any other task. The directory clean the build directory before performing any other task. The directory
is cleaned only if it was populated by a previous jhalfs run. is cleaned only if it was populated by a previous jhalfs run.
-EOF- -EOF-
@ -903,8 +903,8 @@ get_sources() { # Download file, write name to MISSING_FILES.DMP if
done done
if [[ -s MISSING_FILES.DMP ]]; then if [[ -s MISSING_FILES.DMP ]]; then
echo -e "\n\n${tab_}${RED} One or more files were not retrieved or have a bad MD5SUMS.\n${tab_} Check ${L_arrow}$BUILDDIR/sources/MISSING_FILES.DMP${R_arrow} for names ${OFF}\n" echo -e "\n\n${tab_}${RED} One or more files were not retrieved or have bad MD5SUMS.\n${tab_} Check ${L_arrow}$BUILDDIR/sources/MISSING_FILES.DMP${R_arrow} for names ${OFF}\n"
# Do not allow the automatic exection of the Makefile. # Do not allow the automatic execution of the Makefile.
echo "${tab_}${BOLD}${RED}*** ${YELLOW}Automatic execution of the generated makefile has been inhibited. ${RED}***${OFF}${nl_}" echo "${tab_}${BOLD}${RED}*** ${YELLOW}Automatic execution of the generated makefile has been inhibited. ${RED}***${OFF}${nl_}"
RUNMAKE=0 RUNMAKE=0
fi fi

2
common/makefile-functions
View file

@ -65,7 +65,7 @@ define echo_finished
@echo @echo
@echo -e \\t- Exit from the chroot. @echo -e \\t- Exit from the chroot.
@echo @echo
@echo -e \\t- Set-up the boot loader, except if building CLFS with METHOO=boot. @echo -e \\t- Set-up the boot loader, except if building CLFS with METHOD=boot.
@echo -e \\tYou can set-up the host bootloader or the new boot-loader @echo -e \\tYou can set-up the host bootloader or the new boot-loader
@echo -e \\tinstalled on the new system. @echo -e \\tinstalled on the new system.
@echo -e \\tIf the last, you must to mount the virtual filesystems, re-enter @echo -e \\tIf the last, you must to mount the virtual filesystems, re-enter

14
master.sh
View file

@ -193,7 +193,7 @@ while test $# -gt 0 ; do
WC=1 WC=1
BOOK=$1 BOOK=$1
else else
echo -e "\nLooks like $1 isn't a LFS working copy." echo -e "\nLooks like $1 isn't an LFS working copy."
exit 1 exit 1
fi fi
;; ;;
@ -211,14 +211,14 @@ while test $# -gt 0 ; do
WC=1 WC=1
BOOK=$1 BOOK=$1
else else
echo -e "\nLooks like $1 isn't a HLFS working copy." echo -e "\nLooks like $1 isn't an HLFS working copy."
exit 1 exit 1
fi fi
;; ;;
esac esac
;; ;;
--comparasion | -C ) --comparison | -C )
test $# = 1 && eval "$exit_missing_arg" test $# = 1 && eval "$exit_missing_arg"
shift shift
case $1 in case $1 in
@ -346,7 +346,7 @@ while test $# -gt 0 ; do
TARGET32="powerpc-unknown-linux-gnu" TARGET32="powerpc-unknown-linux-gnu"
;; ;;
* ) * )
echo -e "\n$1 is an unknown or unsopported arch." echo -e "\n$1 is an unknown or unsupported arch."
exit 1 exit 1
;; ;;
esac esac
@ -411,7 +411,7 @@ BOOK=${BOOK:=$PROGNAME-$LFSVRS}
#=================================================== #===================================================
# Check for minumum gcc and kernel versions # Check for minimum gcc and kernel versions
#check_requirements 1 # 0/1 0-do not display values. #check_requirements 1 # 0/1 0-do not display values.
echo echo
check_version "2.6.2" "`uname -r`" "KERNEL" check_version "2.6.2" "`uname -r`" "KERNEL"
@ -494,7 +494,7 @@ if [[ "$PWD" != "$JHALFSDIR" ]]; then
fi fi
# #
if [[ -n "$FILES" ]]; then if [[ -n "$FILES" ]]; then
# pushd/popd necessary to deal with mulitiple files # pushd/popd necessary to deal with multiple files
pushd $PACKAGE_DIR 1> /dev/null pushd $PACKAGE_DIR 1> /dev/null
cp $FILES $JHALFSDIR/ cp $FILES $JHALFSDIR/
popd 1> /dev/null popd 1> /dev/null
@ -502,7 +502,7 @@ if [[ "$PWD" != "$JHALFSDIR" ]]; then
# #
if [[ "$REPORT" = "1" ]]; then if [[ "$REPORT" = "1" ]]; then
cp $COMMON_DIR/create-sbu_du-report.sh $JHALFSDIR/ cp $COMMON_DIR/create-sbu_du-report.sh $JHALFSDIR/
# After be sure that all look sane, dump the settings to a file # After being sure that all looks sane, dump the settings to a file
# This file will be used to create the REPORT header # This file will be used to create the REPORT header
validate_config > $JHALFSDIR/jhalfs.config validate_config > $JHALFSDIR/jhalfs.config
fi fi