I'm in the process of updating CLFS to account for the changed keymap
files location in the final system, as well as the text in the "boot"
section. I think jhalfs should have 2 separate KEYMAP options - one for
the "boot" section and one for the final-system. There are likely to be
users (like me, for instance) who generally just use the console
bootscript to set the keymap at boot time, but would like to compile it
into the kernel when building a system by the boot method (simply
because kbd isn't installed at that point so using the bootscript or
loadkeys program is impossible). Also, the option for the "boot" section
should ask for the entire path to the keymap (rather than assuming
/usr/share/kbd or /lib/kbd, since you don't really know where those
files will be on the host).
I've also attached a patch with a number of text updates for jhalfs, as
well as changing the path to the keymap to match what's in the book.
Index: jhalfs/trunk/LFS/config
===================================================================
--- jhalfs/trunk/LFS/config (revision 2837)
+++ jhalfs/trunk/LFS/config (working copy)
@@ -10,10 +10,10 @@
FSTAB=
#--- Fully qualified path to a kernel config file
-# If no config file is specified the kernel is NOT compiled
+# If no config file is specified the kernel is NOT compiled
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)
GETKERNEL=0
Index: jhalfs/trunk/common/config
===================================================================
--- jhalfs/trunk/common/config (revision 2837)
+++ jhalfs/trunk/common/config (working copy)
@@ -68,7 +68,7 @@
LC_ALL=$LC_ALL # (not used in LFS)
#--- Include the keymap in the kernel if defined. Path to the
-# keymap file relative to /usr/share/kbd/keymaps/
+# keymap file relative to /lib/kbd/keymaps/
# (e.g., i386/qwerty/us.map.gz) or "none"
# Not used in LFS
KEYMAP=none
Index: jhalfs/trunk/common/func_validate_configs.sh
===================================================================
--- jhalfs/trunk/common/func_validate_configs.sh (revision 2837)
+++ jhalfs/trunk/common/func_validate_configs.sh (working copy)
@@ -251,7 +251,7 @@
KEYMAP) echo "`eval echo $PARAM_VALS`"
save_param=${KEYMAP}
[[ ! "${!config_param}" = "none" ]] &&
- KEYMAP="/usr/share/kbd/keymaps/${KEYMAP}" &&
+ KEYMAP="/lib/kbd/keymaps/${KEYMAP}" &&
validate_file -z -e -s
KEYMAP=${save_param}
;;
Index: jhalfs/trunk/common/common-functions
===================================================================
--- jhalfs/trunk/common/common-functions (revision 2837)
+++ jhalfs/trunk/common/common-functions (working copy)
@@ -56,7 +56,7 @@
dev*, trunk, SVN = aliases for the Development version of {C,H}LFS
branch-NAME = a branch of name NAME
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
${BOLD} -D --directory DIR${OFF}
@@ -87,14 +87,14 @@
${BOLD} -W, --working-copy DIR${OFF}
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
considerably because the entire final system will rebuild itself
the number of times specified by ITERATIONS in common/config.
Types allowed are:
ICA = do ICA as designed by Greg Schafer
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}
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 @@
run make on the generated Makefile
${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.
-EOF-
@@ -932,8 +932,8 @@
done
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"
- # Do not allow the automatic exection of the Makefile.
+ 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 execution of the Makefile.
echo "${tab_}${BOLD}${RED}*** ${YELLOW}Automatic execution of the
generated makefile has been inhibited. ${RED}***${OFF}${nl_}"
RUNMAKE=0
fi
Index: jhalfs/trunk/README
===================================================================
--- jhalfs/trunk/README (revision 2837)
+++ jhalfs/trunk/README (working copy)
@@ -74,7 +74,7 @@
# 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
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.
-D /mnt/partition4
@@ -153,9 +153,9 @@
latest version of jhalfs to see if that solves your problem.
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
- 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.
The layout below $BUILDDIR is as follows.
@@ -180,7 +180,7 @@
A. The best way to set the value of SRC_ARCHIVE is
export SRC_ARCHIVE=/wherever/you/store/downloaded/packages
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?"
A. The package files must be visible during the chroot phase and this is a
@@ -199,7 +199,7 @@
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
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
carefully and don't skip the easy parts (there are none..)
Index: jhalfs/trunk/master.sh
===================================================================
--- jhalfs/trunk/master.sh (revision 2837)
+++ jhalfs/trunk/master.sh (working copy)
@@ -193,7 +193,7 @@
WC=1
BOOK=$1
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
fi
;;
@@ -211,14 +211,14 @@
WC=1
BOOK=$1
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
fi
;;
esac
;;
- --comparasion | -C )
+ --comparison | -C )
test $# = 1 && eval "$exit_missing_arg"
shift
case $1 in
@@ -350,7 +350,7 @@
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
;;
esac
@@ -415,7 +415,7 @@
#===================================================
-# Check for minumum gcc and kernel versions
+# Check for minimum gcc and kernel versions
#check_requirements 1 # 0/1 0-do not display values.
echo
check_version "2.6.2" "`uname -r`" "KERNEL"
@@ -498,7 +498,7 @@
fi
#
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
cp $FILES $JHALFSDIR/
popd 1> /dev/null
@@ -506,7 +506,7 @@
#
if [[ "$REPORT" = "1" ]]; then
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
validate_config > $JHALFSDIR/jhalfs.config
fi
Index: jhalfs/trunk/TODO
===================================================================
--- jhalfs/trunk/TODO (revision 2837)
+++ jhalfs/trunk/TODO (working copy)
@@ -5,7 +5,7 @@
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.
Before working on that we need to fix the BLFS support.
@@ -31,9 +31,9 @@
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.
- 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.
- To create a script to install jhalfs system-wide, if possible.
--
http://linuxfromscratch.org/mailman/listinfo/alfs-discuss
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
