From 90e3cb3f0e14cadecc0edf2b6de96ee432bc60de Mon Sep 17 00:00:00 2001 From: Alex Gronenwoud Date: Sun, 1 Feb 2004 21:49:10 +0000 Subject: Replacing several tags by . git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3203 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter06/aboutdebug.xml | 2 +- chapter06/bash.xml | 2 +- chapter06/bzip2.xml | 6 +++--- chapter06/chapter06.xml | 27 +++++++++++++-------------- chapter06/config-glibc.xml | 2 +- chapter06/config-shadowpwd.xml | 4 ++-- chapter06/config-vim.xml | 14 +++++++------- chapter06/coreutils.xml | 8 ++++---- chapter06/flex.xml | 6 +++--- chapter06/gcc.xml | 2 +- chapter06/glibc.xml | 2 +- chapter06/groff.xml | 2 +- chapter06/gzip.xml | 4 ++-- chapter06/inetutils.xml | 2 +- chapter06/kbd.xml | 4 ++-- chapter06/lfs-utils.xml | 2 +- chapter06/makedev.xml | 8 ++++---- chapter06/man.xml | 10 +++++----- chapter06/mountproc.xml | 2 +- chapter06/nettools.xml | 4 ++-- chapter06/patch.xml | 2 +- chapter06/perl.xml | 2 +- chapter06/psmisc.xml | 4 ++-- chapter06/shadowpwd.xml | 6 +++--- chapter06/utillinux.xml | 8 ++++---- chapter06/vim.xml | 2 +- 26 files changed, 68 insertions(+), 69 deletions(-) (limited to 'chapter06') diff --git a/chapter06/aboutdebug.xml b/chapter06/aboutdebug.xml index dff5d0775..ccf05b83e 100644 --- a/chapter06/aboutdebug.xml +++ b/chapter06/aboutdebug.xml @@ -37,7 +37,7 @@ symbols, the difference will generally be a factor between 2 and 5. software, a lot of disk space can be regained by removing these symbols . To remove debugging symbols from a binary (which must be an a.out -or ELF binary), run strip --strip-debug filename. +or ELF binary), run strip --strip-debug filename. Wildcards can be used to treat multiple files (use something like strip --strip-debug $LFS/tools/bin/*). diff --git a/chapter06/bash.xml b/chapter06/bash.xml index 994b7000c..f7862db68 100644 --- a/chapter06/bash.xml +++ b/chapter06/bash.xml @@ -39,7 +39,7 @@ following command will do so: make install -And reload the newly compiled bash program: +And reload the newly compiled bash program: exec /bin/bash --login +h diff --git a/chapter06/bzip2.xml b/chapter06/bzip2.xml index e67810b0d..d1893c1f0 100644 --- a/chapter06/bzip2.xml +++ b/chapter06/bzip2.xml @@ -4,7 +4,7 @@ The Bzip2 package contains programs for compressing and decompressing files. On text files they achieve a much better compression than the -traditional gzip. +traditional gzip. &buildtime; &bzip2-time; &diskspace; &bzip2-compsize; @@ -34,13 +34,13 @@ against it. If you are reinstalling Bzip2, you will now first have to do rm -f /usr/bin/bz*, otherwise the following -make install will fail. +make install will fail. Install the programs: make install -And install the shared bzip2 binary into the +And install the shared bzip2 binary into the /bin directory, then make some necessary symbolic links, and clean up: diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml index 6364740be..f97d4d777 100644 --- a/chapter06/chapter06.xml +++ b/chapter06/chapter06.xml @@ -68,13 +68,12 @@ with a series of short descriptions of these. It is time to enter the chroot environment in order to begin installing the packages we need. Before you can chroot, however, you need to become root, since only root -can execute the chroot command. +can execute the chroot command. Just like earlier, ensure the LFS environment variable is set up properly by running echo $LFS and ensuring it shows the path to your LFS partition's mount point, which is -/mnt/lfs if you followed our -example. +/mnt/lfs if you followed our example. Become root and run the following command to enter the chroot environment: @@ -84,12 +83,12 @@ to enter the chroot environment:     PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin \     /tools/bin/bash --login +h -The -i option given to the -env command will clear all variables of the chroot +The -i option given to the +env command will clear all variables of the chroot environment. After that, only the HOME, TERM, PS1 and PATH variables are set again. The TERM=$TERM construct will set the TERM variable inside chroot to the same value as outside chroot; this variable is needed for programs -like vim and less to operate +like vim and less to operate properly. If you need other variables present, such as CFLAGS or CXXFLAGS, this is a good place to set them again. @@ -103,8 +102,8 @@ the chroot command. last in the PATH. This means that a temporary tool will not be used any more as soon as its final version is installed. Well, at least when the shell doesn't remember the locations of executed binaries -- for this reason hashing -is switched off by passing the +h option to -bash. +is switched off by passing the +h option to +bash. You have to make sure all the commands in the rest of this chapter and in the following chapters are run from within the chroot environment. @@ -281,15 +280,15 @@ will now work. exec /tools/bin/bash --login +h -Note the use of the +h directive. This tells -bash not to use its internal path hashing. Without this -directive, bash would remember the paths to binaries it +Note the use of the +h directive. This tells +bash not to use its internal path hashing. Without this +directive, bash would remember the paths to binaries it has executed. Since we want to use our newly compiled binaries as soon as they are installed, we turn off this function for the duration of this chapter. -The login, agetty and -init programs (and some others) use a number of log +The login, agetty and +init programs (and some others) use a number of log files to record information such as who was logged into the system and when. These programs, however, won't write to the log files if they don't already exist. Initialize the log files and give them their proper permissions: @@ -341,7 +340,7 @@ identical. From now on every compiled program will link only against the libraries in /usr/lib and /lib. The extra -INSTALL=/tools/bin/install is needed because the Makefile +INSTALL=/tools/bin/install is needed because the Makefile created during the second pass still contains the reference to /usr/bin/install, which we obviously haven't installed yet. Some host distributions contain a ginstall diff --git a/chapter06/config-glibc.xml b/chapter06/config-glibc.xml index e92a7caf5..6d74eed27 100644 --- a/chapter06/config-glibc.xml +++ b/chapter06/config-glibc.xml @@ -54,7 +54,7 @@ user mode. Of course, instead of Canada/Eastern, fill in -the name of the time zone that the tzselect script +the name of the time zone that the tzselect script gave you. diff --git a/chapter06/config-shadowpwd.xml b/chapter06/config-shadowpwd.xml index 769292fbc..e3268b6f2 100644 --- a/chapter06/config-shadowpwd.xml +++ b/chapter06/config-shadowpwd.xml @@ -23,7 +23,7 @@ command: Under normal circumstances, you won't have created any passwords yet. However, if returning to this section to enable shadowing, you should reset any -current user passwords with the passwd command or any -group passwords with the gpasswd command. +current user passwords with the passwd command or any +group passwords with the gpasswd command. diff --git a/chapter06/config-vim.xml b/chapter06/config-vim.xml index ab9aea8bf..7fa0650ac 100644 --- a/chapter06/config-vim.xml +++ b/chapter06/config-vim.xml @@ -2,10 +2,10 @@ Configuring Vim -By default, vim runs in vi-compatible mode. Some -people might like this, but we prefer to run vim in its +By default, vim runs in vi-compatible mode. Some +people might like this, but we prefer to run vim in its own mode (else we wouldn't have included it in this book, but the original -vi). Create a default vim configuration file by running +vi). Create a default vim configuration file by running the following: cat > /etc/vimrc << "EOF" @@ -18,11 +18,11 @@ syntax on " End /etc/vimrc EOF -The set nocompatible will make -vim behave in a more useful way than the default -vi-compatible manner. The set backspace=2 allows +The set nocompatible will make +vim behave in a more useful way than the default +vi-compatible manner. The set backspace=2 allows backspacing over line breaks, autoindent and the start of insert. And the -syntax on switches on vim's +syntax on switches on vim's semantic colouring. diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml index 38c605909..0d2f9cb81 100644 --- a/chapter06/coreutils.xml +++ b/chapter06/coreutils.xml @@ -20,14 +20,14 @@ basic system characteristics. patch -Np1 -i ../&coreutils-posixver-patch; -Normally the functionality of uname is somewhat -broken, in that the -p switch always returns "unknown". +Normally the functionality of uname is somewhat +broken, in that the -p switch always returns "unknown". The following patch fixes this behaviour for Intel architectures: patch -Np1 -i ../&coreutils-uname-patch; We do not want Coreutils to install its version of the -hostname program, because it is inferior to the version +hostname program, because it is inferior to the version provided by Net-tools. Prevent its installation by applying a patch: patch -Np1 -i ../&coreutils-hostname-patch; @@ -40,7 +40,7 @@ provided by Net-tools. Prevent its installation by applying a patch: make -The su program from Coreutils wasn't installed in +The su program from Coreutils wasn't installed in Chapter 5 because it needed root privilege to do so. We're going to need it in a few moments for the test suite. Therefore we work around the problem by installing it now: diff --git a/chapter06/flex.xml b/chapter06/flex.xml index ff36d5748..809f1ca31 100644 --- a/chapter06/flex.xml +++ b/chapter06/flex.xml @@ -39,10 +39,10 @@ following command will do so: ln -s libfl.a /usr/lib/libl.a -A few programs don't know about flex yet and try -to run its predecessor lex. To support those programs, +A few programs don't know about flex yet and try +to run its predecessor lex. To support those programs, create a shell script named lex that calls -flex in Lex emulation mode: +flex in Lex emulation mode: cat > /usr/bin/lex << "EOF" #!/bin/sh diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml index 670a35b70..920ff6831 100644 --- a/chapter06/gcc.xml +++ b/chapter06/gcc.xml @@ -86,7 +86,7 @@ To honor those packages, create this symlink: ln -s ../usr/bin/cpp /lib -Many packages use the name cc to call the C +Many packages use the name cc to call the C compiler. To satisfy those packages, create a symlink: ln -s gcc /usr/bin/cc diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml index 2df7bdd3b..5b8d60f4c 100644 --- a/chapter06/glibc.xml +++ b/chapter06/glibc.xml @@ -91,7 +91,7 @@ weren't installed by the above command. Do it with this: An alternative to running the previous command is to install only those locales which you need or want. This can be achieved by using the -localedef command. Information on this can be found in +localedef command. Information on this can be found in the INSTALL file in the Glibc source. However, there are a number of locales that are essential for the tests of future packages to pass, in particular, the libstdc++ tests from GCC. The diff --git a/chapter06/groff.xml b/chapter06/groff.xml index f7c3ed066..3722ba239 100644 --- a/chapter06/groff.xml +++ b/chapter06/groff.xml @@ -32,7 +32,7 @@ live elsewhere, you may want to change PAGE=letter to make install -Some documentation programs, such as xman, +Some documentation programs, such as xman, will not work properly without the following symlinks: ln -s soelim /usr/bin/zsoelim diff --git a/chapter06/gzip.xml b/chapter06/gzip.xml index a2b52b8f2..81e054b4d 100644 --- a/chapter06/gzip.xml +++ b/chapter06/gzip.xml @@ -20,8 +20,8 @@ files. ./configure --prefix=/usr -The gzexe script has the location of the -gzip binary hard-wired into it. Because we later change +The gzexe script has the location of the +gzip binary hard-wired into it. Because we later change the location of the binary, the following command assures that the new location gets placed into the script: diff --git a/chapter06/inetutils.xml b/chapter06/inetutils.xml index f35b948d1..c5a4fc880 100644 --- a/chapter06/inetutils.xml +++ b/chapter06/inetutils.xml @@ -61,7 +61,7 @@ replacements are available for many of these servers. make install -And move the ping program to its proper place: +And move the ping program to its proper place: mv /usr/bin/ping /bin diff --git a/chapter06/kbd.xml b/chapter06/kbd.xml index 32cb7e4dc..34cea17fc 100644 --- a/chapter06/kbd.xml +++ b/chapter06/kbd.xml @@ -15,8 +15,8 @@ Installation of Kbd -By default some of Kbd's utilities (setlogcons, -setvesablank and getunimap) are +By default some of Kbd's utilities (setlogcons, +setvesablank and getunimap) are not installed. First enable the compilation of these utilities: patch -Np1 -i ../&kbd-patch; diff --git a/chapter06/lfs-utils.xml b/chapter06/lfs-utils.xml index ea1af2068..a4a025126 100644 --- a/chapter06/lfs-utils.xml +++ b/chapter06/lfs-utils.xml @@ -23,7 +23,7 @@ --with-libc: This causes the -mktemp program to use the mkstemp +mktemp program to use the mkstemp and mkdtemp functions from the system C library. diff --git a/chapter06/makedev.xml b/chapter06/makedev.xml index d98a59241..0763e8c8f 100644 --- a/chapter06/makedev.xml +++ b/chapter06/makedev.xml @@ -16,10 +16,10 @@ Making devices Note that unpacking the MAKEDEV-&makedev-version;.bz2 -file doesn't create a directory for you to cd into, as +file doesn't create a directory for you to cd into, as the file contains only a shell script. -Install the MAKEDEV script: +Install the MAKEDEV script: bzcat MAKEDEV-&makedev-version;.bz2 > /dev/MAKEDEV chmod 754 /dev/MAKEDEV @@ -36,7 +36,7 @@ chmod 754 /dev/MAKEDEV verbose mode. generic-nopty: This instructs -MAKEDEV to create a generic selection of commonly used +MAKEDEV to create a generic selection of commonly used device special files, except for the ptyXX and ttyXX range of files. We don't need those files because we are going to use Unix98 PTYs via the devpts file system. @@ -44,7 +44,7 @@ need those files because we are going to use Unix98 PTYs via the If it turns out that some special device zzz that you need is missing, try running ./MAKEDEV -v zzz. -Alternatively, you may create devices via the mknod +Alternatively, you may create devices via the mknod program. Please refer to its man and info pages if you need more information. diff --git a/chapter06/man.xml b/chapter06/man.xml index 2594c8936..d308a1263 100644 --- a/chapter06/man.xml +++ b/chapter06/man.xml @@ -31,7 +31,7 @@ properly handled by Less: The third is also a sed substitution to comment out the "MANPATH /usr/man" line in the man.conf file to prevent redundant -results when using programs such as whatis: +results when using programs such as whatis: sed -i 's%MANPATH./usr/man%#&%' src/man.conf.in @@ -50,7 +50,7 @@ FHS by putting cat pages under /var/cache/man provided that that directory exists. -confdir=/etc: This tells the -man program to look for the man.conf +man program to look for the man.conf configuration file in the /etc directory. @@ -62,9 +62,9 @@ configuration file in the /etc directory. make install -If you wish to disable SGR escape sequences, you should -edit the man.conf file and add the -c argument -to nroff. +If you wish to disable SGR escape sequences, you should edit the +man.conf file and add the -c switch +to NROFF. You may want to also take a look at the BLFS page at which deals with diff --git a/chapter06/mountproc.xml b/chapter06/mountproc.xml index a60f76e10..e15c3546e 100644 --- a/chapter06/mountproc.xml +++ b/chapter06/mountproc.xml @@ -44,7 +44,7 @@ now the most common way for pseudo terminals (PTYs) to be implemented. The most likely cause is that your host system's kernel was compiled without support for the devpts file system. You can check which file systems your kernel supports by peeking into its internals with a command such as -cat /proc/filesystems. If a file system type named +cat /proc/filesystems. If a file system type named devfs is listed there, then we'll be able to work around the problem by mounting the host's devfs file system on top of the new /dev structure which we'll create later on in the section diff --git a/chapter06/nettools.xml b/chapter06/nettools.xml index 56e313d73..70bcdd33a 100644 --- a/chapter06/nettools.xml +++ b/chapter06/nettools.xml @@ -16,7 +16,7 @@ Installation of Net-tools If you don't know what to answer to all the questions asked during the -make config phase below, then just accept the defaults. +make config phase below, then just accept the defaults. This will be just fine in the majority of cases. What you're asked here is a bunch of questions about which network protocols you've enabled in your kernel. The default answers will enable the tools from this package to work @@ -35,7 +35,7 @@ program: make config If you intend to accept the default settings, you may skip the -questions generated by make config by running +questions generated by make config by running yes "" | make config instead. Compile the package: diff --git a/chapter06/patch.xml b/chapter06/patch.xml index 0b58365d6..57bb23a7a 100644 --- a/chapter06/patch.xml +++ b/chapter06/patch.xml @@ -19,7 +19,7 @@ CPPFLAGS=-D_GNU_SOURCE ./configure --prefix=/usr -Again, the preprocessor flag -D_GNU_SOURCE is only +Again, the preprocessor flag -D_GNU_SOURCE is only needed on the PowerPC platform. On other architectures you can leave it out. Compile the package: diff --git a/chapter06/perl.xml b/chapter06/perl.xml index f1d0598bf..8e69cbcee 100644 --- a/chapter06/perl.xml +++ b/chapter06/perl.xml @@ -22,7 +22,7 @@ ./configure.gnu --prefix=/usr -Dpager="/bin/less -isR" If you want more control over the way Perl sets itself up to be -built, you can run the interactive Configure script +built, you can run the interactive Configure script instead and modify the way Perl is built. If you think you can live with the (sensible) defaults Perl auto-detects, then just use the command listed above. diff --git a/chapter06/psmisc.xml b/chapter06/psmisc.xml index 3cde75179..f506ed5b8 100644 --- a/chapter06/psmisc.xml +++ b/chapter06/psmisc.xml @@ -48,9 +48,9 @@ therefore make it a symbolic link to pstree: mv /bin/pstree* /usr/bin ln -sf pstree /usr/bin/pstree.x11 -By default Psmisc's pidof program isn't installed. +By default Psmisc's pidof program isn't installed. Generally, this isn't a problem because we later install the Sysvinit package, -which provides a better pidof program. But if you're not +which provides a better pidof program. But if you're not going to use Sysvinit, you should complete the installation of Psmisc by creating the following symlink: diff --git a/chapter06/shadowpwd.xml b/chapter06/shadowpwd.xml index 856262fe3..5c9c6b510 100644 --- a/chapter06/shadowpwd.xml +++ b/chapter06/shadowpwd.xml @@ -16,9 +16,9 @@ way. Installation of Shadow -Shadow hard-wires the path to the passwd binary +Shadow hard-wires the path to the passwd binary within the binary itself, but does this the wrong way. If a -passwd binary is not present before installing Shadow, +passwd binary is not present before installing Shadow, the package incorrectly assumes it is going to be located at /bin/passwd, but then installs it in /usr/bin/passwd. This will lead to errors about not finding @@ -84,7 +84,7 @@ directory for it to work properly: mkdir /etc/default -Coreutils has already installed a better groups +Coreutils has already installed a better groups program in /usr/bin. Remove the one installed by Shadow: diff --git a/chapter06/utillinux.xml b/chapter06/utillinux.xml index f167cfb80..fd543bdbb 100644 --- a/chapter06/utillinux.xml +++ b/chapter06/utillinux.xml @@ -19,7 +19,7 @@ messages. The FHS recommends that we use /var/lib/hwclock, instead of the usual /etc, as the location for the -adjtime file. To make the hwclock +adjtime file. To make the hwclock program FHS-compliant, run the following: cp hwclock/hwclock.c{,.backup} @@ -44,12 +44,12 @@ mkdir -p /var/lib/hwclock HAVE_KILL=yes: This prevents the -kill program (already installed by Procps) from being +kill program (already installed by Procps) from being built and installed again. HAVE_SLN=yes: This prevents the -sln program (a statically linked -ln, already installed by Glibc) from being built and +sln program (a statically linked +ln, already installed by Glibc) from being built and installed again. diff --git a/chapter06/vim.xml b/chapter06/vim.xml index e82ccb111..7159413f7 100644 --- a/chapter06/vim.xml +++ b/chapter06/vim.xml @@ -52,7 +52,7 @@ the following command will do so: make install -When called as vi, vim +When called as vi, vim will run in old-fashioned vi-mode. To allow this, create a symlink: ln -s vim /usr/bin/vi -- cgit v1.2.3-54-g00ecf