From 67e3bc39ae3c6611ce473aa0eab1e4fbd0037c80 Mon Sep 17 00:00:00 2001 From: Manuel Canales Esparcia Date: Thu, 30 Mar 2006 18:26:11 +0000 Subject: [PATCH] Small text fixes. Placing authors in alphabetical order. --- README | 19 ++++++++++--------- common/common-functions | 4 ++-- common/config | 2 +- common/makefile-functions | 7 ++++--- 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/README b/README index 735ba7e..94bb734 100644 --- a/README +++ b/README @@ -4,7 +4,7 @@ $Id$ This collection of scripts, known as jhalfs-X, strives to create accurate makefiles from the Linux From Scratch book series XML files. - This software was inspired by the "jhalfs" code written by Jeremy Huntwork. + This software is a evolution of the original "jhalfs" 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 files @@ -15,7 +15,7 @@ $Id$ *. The resulting Makefile takes considerable time to run to completion, lay in a supply of caffeine beverages. - *. It is recommended that you temporarily unpack your linux kernel, + *. It is recommended that you temporarily unpack your linux kernel, run , configure the kernal as per the book and save the resulting .config file. This configuration rule also applies to the configuration of the uClibc package when building a HLFS system using @@ -30,22 +30,22 @@ $Id$ as well as the common parameters file. 4. RUNNING:: - The script, master.sh, cannot be invoked directly but only via the + 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. - refers to the one of 4 package symlinks, lfs,hlfs,clfs,blfs. + refers to the one of 4 package symlinks, lfs,hlfs,clfs,blfs. Replace with your choice.. i.e. ./lfs ./ - Create a makefile based on the settings found in the config files. + Create a makefile based on the settings found in the config files. You must enter the build partition/jhalfs directory and manually run make - ./ -G + ./ -G Download the packages and patches necessary to build - + ./ -G -M Download the packages, create and automatically run the Makefile - + ./ --help will give you a context sensitive list of command line switches. @@ -77,5 +77,6 @@ $Id$ Authors: + George Boudreau Manuel Canales Esparcia - George Boudreau \ No newline at end of file + Jeremy Huntwork diff --git a/common/common-functions b/common/common-functions index 48f3965..c08dc74 100644 --- a/common/common-functions +++ b/common/common-functions @@ -145,9 +145,9 @@ ${BOLD} \"jhalfs-X\"${OFF} builder tool (development) \$Rev$ ${BOLD} \"${PROGNAME}\"${OFF} script module -Written by Jeremy Huntwork, +Written by George Boudreau, Manuel Canales Esparcia, - George Boudreau + Jeremy Huntwork This program is published under the ${BOLD}Gnu General Public License, Version 2.${OFF} " diff --git a/common/config b/common/config index 1456174..eae4146 100644 --- a/common/config +++ b/common/config @@ -10,7 +10,7 @@ declare -r LOG=000-masterscript.log declare -r HTTP=http://ftp.lfs-matrix.net/pub/lfs/conglomeration #--- Mount point for the build -BUILDDIR=/mnt/SourceFiles +BUILDDIR=/mnt/build_dir #--- The local repository for packages/file # Any missing file will be downloaded and archived here, diff --git a/common/makefile-functions b/common/makefile-functions index 7166af5..2a62397 100644 --- a/common/makefile-functions +++ b/common/makefile-functions @@ -42,7 +42,8 @@ define echo_finished @echo the next steps:$(WHITE) @echo @echo -e \\t- Enter to the chroot using the command found - @echo -e \\tin the chapter -Entering the Chroot Environment- + @echo -e \\tin the section -Entering the Chroot Environment- + @echo -e \\texcept if building CLFS with METHOO=boot. @echo @echo -e \\t- Set a password for the root user @echo @@ -51,7 +52,7 @@ define echo_finished @echo -e \\t/etc/sysconfig//network-devices/ifconfig.eth0/ipv4 and @echo -e \\tany other configuration file required to suit your needs. @echo - @echo -e \\t- Set-up Grub. See chapter08/grub.html + @echo -e \\t- Set-up the boot loader. See the relevant book section. @echo @echo -e \\t- Unmount the filesystems. @echo @@ -74,7 +75,7 @@ define echo_boot_finished @echo @echo The build is not complete. Follow the next steps:$(WHITE) @echo - @echo -e \\t- Edit $(BUILDDIR)/etc/fstab + @echo -e \\t- Edit $(MOUNT_PT)/etc/fstab @echo -e \\t and any other configuration file required to suit your needs. @echo $(BOLD) @echo $(BOLD)$(YELLOW)