From 73e54484d1242895ee5a4825c1ab81b07ffbe1f5 Mon Sep 17 00:00:00 2001 From: Manuel Canales Esparcia Date: Sun, 9 Apr 2006 10:38:40 +0000 Subject: [PATCH] The tool in trunk is called "jhalfs" --- README | 14 +++++++------- TODO | 2 +- common/common-functions | 12 ++++++------ master.sh | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/README b/README index 35f85f1..ae4f0d5 100644 --- a/README +++ b/README @@ -2,9 +2,9 @@ $Id$ 1. INTRODUCTION:: - This collection of scripts, known as jhalfs-X, strives to create + This collection of scripts, known as jhalfs, strives to create accurate makefiles from the Linux From Scratch book series XML files. - This software is an evolution of the original "jhalfs" code. + This software is an evolution of the original "jhalfs-0.2" code. The usage of this script assumes you have read and are familiar with the book(s) and, therefore, the configuration variables found in config @@ -33,7 +33,7 @@ $Id$ The script master.sh cannot be invoked directly but only via the supplied symlinks. After editing the config file for the project you wish to build, run the script. - + The term refers to the 1 of 4 package symlinks, lfs,hlfs,clfs,blfs. Replace with your choice of packages; i.e.: ./lfs @@ -78,14 +78,14 @@ $Id$ Q. "What is the function of the SRC_ARCHIVE variable A. When then symlinked master.sh runs it creates a local copy of the - necessary packages in BUILDDIR/sources by downloading the files. If - the variable SRC_ARCHIVE is defined the software will first look in + necessary packages in BUILDDIR/sources by downloading the files. If + the variable SRC_ARCHIVE is defined the software will first look in this location for the file and, if found, will copy it to BUILDDIR/sources. - If the files are not found in SRC_ARCHIVE _and_ you have write priv to + If the files are not found in SRC_ARCHIVE _and_ you have write priv to the directory any downloaded files will be mirrored there. 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 simple and reliable method of doing so. This method also handles the CLFS build method where the final build may be done on a separate machine. diff --git a/TODO b/TODO index 49eb04b..c5e213a 100644 --- a/TODO +++ b/TODO @@ -8,7 +8,7 @@ MASTER SCRIPT - The BLFS moudule should can be called in conjunction with any of LFS, CLFS or HLFS modules. - - To create a Makefile to install jhalfs-X system-wide. + - To create a Makefile to install jhalfs system-wide. Note: is that actually wanted? diff --git a/common/common-functions b/common/common-functions index 5d11789..2d0d11a 100644 --- a/common/common-functions +++ b/common/common-functions @@ -52,7 +52,7 @@ ${BOLD} -B, --book VER${OFF} udev* aliases for the LFS udev_update branch ${BOLD} -D --directory DIR${OFF} - use DIR directory for building ${BOLD}$(echo $PROGNAME | tr [a-z] [A-Z])${OFF}; all files jhalfs-X produces + use DIR directory for building ${BOLD}$(echo $PROGNAME | tr [a-z] [A-Z])${OFF}; all files jhalfs produces will be in the directory DIR/jhalfs. ${BOLD} -G, --get-packages${OFF} @@ -89,7 +89,7 @@ ${BOLD} -M, --run-make${OFF} ${BOLD} -R --rebuild${OFF} clean the build directory before to perfom any other task. The directory - is cleaned only if it was populated by a previous jhalfs-X run. + is cleaned only if it was populated by a previous jhalfs run. -EOF- [[ ${PROGNAME} = "clfs" ]] && @@ -139,7 +139,7 @@ ${DD_BORDER} } version=" -${BOLD} \"jhalfs-X\"${OFF} builder tool (development) \$Rev$ +${BOLD} \"jhalfs\"${OFF} builder tool (development) \$Rev$ \$Date$ ${BOLD} \"${PROGNAME}\"${OFF} script module @@ -162,7 +162,7 @@ ${tab_}${tab_}${BOLD}${RED}W A R N I N G${OFF} from a previous HLFS build. Please format the partition mounted on \$BUILDDIR or set - a different build directory before running jhalfs-X. + a different build directory before running jhalfs. ${OFF} ${DD_BORDER} -EOF- @@ -182,7 +182,7 @@ no_dl_client="\ echo \"Could not find a way to download the ${BOLD}$(echo $PROGNAME | tr [a-z] [A-Z])${OFF} sources.\" >&2 echo \"Attempting to continue.\" >&2" -HEADER="# This file is automatically generated by jhalfs-X +HEADER="# This file is automatically generated by jhalfs # DO NOT EDIT THIS FILE MANUALLY # # Generated on `date \"+%F %X %Z\"`" @@ -441,7 +441,7 @@ clean_builddir() { fi # Test to make sure that the build directory was populated by jhalfs if [ ! -d $JHALFSDIR ] || [ ! -d $BUILDDIR/sources ] ; then - echo "Looks like $BUILDDIR was not populated by a previous jhalfs-X run." + echo "Looks like $BUILDDIR was not populated by a previous jhalfs run." exit 1 else # Clean the build directory diff --git a/master.sh b/master.sh index b6979fa..4a35f6c 100755 --- a/master.sh +++ b/master.sh @@ -14,7 +14,7 @@ simple_error() { # Basic error trap.... JUST DIE } see_ya() { - echo -e "\n\t${BOLD}Goodbye and thank you for choosing ${L_arrow}jhalfs-X${R_arrow}\n" + echo -e "\n\t${BOLD}Goodbye and thank you for choosing ${L_arrow}jhalfs${R_arrow}\n" } ##### Simple error TRAPS # ctrl-c SIGINT