From 8ad79807a3c97e18a90319c9b91018b0be2bbb3c Mon Sep 17 00:00:00 2001 From: Manuel Canales Esparcia Date: Sat, 19 Jun 2004 13:39:28 +0000 Subject: Tags corrections git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3812 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter06/net-tools.xml | 4 +-- chapter06/patch.xml | 6 ++--- chapter06/perl.xml | 34 +++++++++++++------------ chapter06/procps.xml | 2 +- chapter06/psmisc.xml | 16 ++++++------ chapter06/pwdgroup.xml | 10 ++++---- chapter06/readjusting.xml | 10 ++++---- chapter06/revisedchroot.xml | 2 +- chapter06/sed.xml | 5 ++-- chapter06/shadow.xml | 8 +++--- chapter06/sysklogd.xml | 4 +-- chapter06/sysvinit.xml | 20 ++++++++------- chapter06/texinfo.xml | 5 ++-- chapter06/util-linux.xml | 14 +++++----- chapter06/vim.xml | 62 ++++++++++++++++++++++----------------------- chapter06/zlib.xml | 7 ++--- 16 files changed, 107 insertions(+), 102 deletions(-) (limited to 'chapter06') diff --git a/chapter06/net-tools.xml b/chapter06/net-tools.xml index 1b910acf5..e9bc7b096 100644 --- a/chapter06/net-tools.xml +++ b/chapter06/net-tools.xml @@ -137,7 +137,7 @@ statistics.. nisdomainname nisdomainname -does the same as domainname. +does the same as domainname. @@ -178,7 +178,7 @@ terminal lines for point-to-point links to other computers. ypdomainname ypdomainname -does the same as domainname. +does the same as domainname. diff --git a/chapter06/patch.xml b/chapter06/patch.xml index 9bc61574c..d00473296 100644 --- a/chapter06/patch.xml +++ b/chapter06/patch.xml @@ -29,7 +29,7 @@ GCC, Glibc, Grep, Make, Sed Installation of Patch Prepare Patch for compilation (the preprocessor flag --D_GNU_SOURCE is only needed on PowerPCs, on other +-D_GNU_SOURCE is only needed on PowerPCs, on other machines you can leave it out): CPPFLAGS=-D_GNU_SOURCE ./configure --prefix=/usr @@ -59,8 +59,8 @@ machines you can leave it out): patch modifies files according to a patch file. -A patch file normally is a difference listing created with the diff program. -By applying these differences to the original files, patch creates the patched +A patch file normally is a difference listing created with the diff program. +By applying these differences to the original files, patch creates the patched versions. Using patches instead of entirely new tarballs to keep your sources up-to-date can save you a lot of download time. diff --git a/chapter06/perl.xml b/chapter06/perl.xml index 0963dcc54..0b57357be 100644 --- a/chapter06/perl.xml +++ b/chapter06/perl.xml @@ -39,9 +39,9 @@ defaults it auto-detects, then prepare Perl for compilation with: --Dpager="/bin/less -isR" -This corrects an error in the perldoc code with the invocation -of the less program. +-Dpager="/bin/less -isR" +This corrects an error in the perldoc code with the invocation +of the less program. @@ -85,7 +85,7 @@ to c2ph), s2p, splain and xsubpp a2p a2p -translates awk to perl. +translates awk to Perl. @@ -93,7 +93,7 @@ to c2ph), s2p, splain and xsubpp c2ph c2ph -dumps C structures as generated from "cc -g -S" stabs. +dumps C structures as generated from cc -g -S stabs. @@ -101,7 +101,7 @@ to c2ph), s2p, splain and xsubpp dprofpp dprofpp -displays perl profile data. +displays Perl profile data. @@ -118,7 +118,7 @@ from either Unicode Character Mappings or Tcl Encoding Files. find2perl find2perl -translates find commands to perl. +translates find commands to Perl. @@ -126,7 +126,8 @@ from either Unicode Character Mappings or Tcl Encoding Files. h2ph h2ph -converts .h C header files to .ph Perl header files. +converts .h C header files to +.ph Perl header files. @@ -134,7 +135,7 @@ from either Unicode Character Mappings or Tcl Encoding Files. h2xs h2xs -converts .h C header files to Perl extensions. +converts .h C header files to Perl extensions. @@ -142,7 +143,7 @@ from either Unicode Character Mappings or Tcl Encoding Files. libnetcfg libnetcfg -can be used to configure the libnet. +can be used to configure the libnet. @@ -177,7 +178,7 @@ Perl or the modules that come with it, and mail them. perldoc displays a piece of documentation in pod -format that is embedded in the perl installation tree or in a perl script. +format that is embedded in the Perl installation tree or in a Perl script. @@ -203,7 +204,8 @@ converter iconv. pl2pm pl2pm -is a rough tool for converting Perl4 .pl files to Perl5 .pm modules. +is a rough tool for converting Perl4 .pl +files to Perl5 .pm modules. @@ -267,7 +269,7 @@ converter iconv. psed psed -is a Perl version of the stream editor sed. +is a Perl version of the stream editor sed. @@ -275,7 +277,7 @@ converter iconv. pstruct pstruct -dumps C structures as generated from "cc -g -S" stabs. +dumps C structures as generated from cc -g -S stabs. @@ -283,7 +285,7 @@ converter iconv. s2p s2p -translates sed to perl. +translates sed to Perl. @@ -292,7 +294,7 @@ converter iconv. splain is used to force verbose warning -diagnostics in perl. +diagnostics in Perl. diff --git a/chapter06/procps.xml b/chapter06/procps.xml index 5a5c0e74a..073bca8f1 100644 --- a/chapter06/procps.xml +++ b/chapter06/procps.xml @@ -181,7 +181,7 @@ output. This allows you to watch the output change over time. -libproc +libproc libproc contains the functions used by most programs in this package. diff --git a/chapter06/psmisc.xml b/chapter06/psmisc.xml index a95fdd262..419633f0f 100644 --- a/chapter06/psmisc.xml +++ b/chapter06/psmisc.xml @@ -37,11 +37,11 @@ GCC, Gettext, Glibc, Grep, Make, Ncurses, Sed ---exec-prefix="" +--exec-prefix="" This causes the -binaries to be installed in /bin instead of -/usr/bin. As the Psmisc programs are often used in -bootscripts, they should be available also when the /usr +binaries to be installed in /bin instead of +/usr/bin. As the Psmisc programs are often used in +bootscripts, they should be available also when the /usr file system isn't mounted. @@ -54,12 +54,12 @@ file system isn't mounted. make install -There is no reason for the pstree and -pstree.x11 programs to reside in +There is no reason for the pstree and +pstree.x11 programs to reside in /bin. We therefore move them to /usr/bin. Also, there is no need -for pstree.x11 to exist as a separate program. We -therefore make it a symbolic link to pstree: +for pstree.x11 to exist as a separate program. We +therefore make it a symbolic link to pstree: mv /bin/pstree* /usr/bin ln -sf pstree /usr/bin/pstree.x11 diff --git a/chapter06/pwdgroup.xml b/chapter06/pwdgroup.xml index e73b61049..ad1c36723 100644 --- a/chapter06/pwdgroup.xml +++ b/chapter06/pwdgroup.xml @@ -22,9 +22,9 @@ the /etc/passwd and /etc/group files. Create the /etc/passwd file by running the following command: -cat > /etc/passwd << "EOF" +cat > /etc/passwd << "EOF" root:x:0:0:root:/root:/bin/bash -EOF +EOF The actual password for root (the x here is just a placeholder) will be set later. @@ -32,7 +32,7 @@ here is just a placeholder) will be set later. Create the /etc/group file by running the following command: -cat > /etc/group << "EOF" +cat > /etc/group << "EOF" root:x:0: bin:x:1: sys:x:2: @@ -48,7 +48,7 @@ audio:x:11: video:x:12: utmp:x:13: usb:x:14: -EOF +EOF The created groups aren't part of any standard -- they are some of the groups that the Udev configuration we will be using in the next section @@ -67,7 +67,7 @@ user name and group name resolution will now work. exec /tools/bin/bash --login +h -Note the use of the +h directive. This tells +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 diff --git a/chapter06/readjusting.xml b/chapter06/readjusting.xml index a81c540f6..c7ab66921 100644 --- a/chapter06/readjusting.xml +++ b/chapter06/readjusting.xml @@ -35,11 +35,11 @@ however, our testing has shown that the resulting Binutils program binaries should be 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 +against the libraries in /usr/lib and +/lib. The extra +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. +/usr/bin/install, which we obviously haven't installed yet. Some host distributions contain a ginstall symbolic link which takes precedence in the Makefile and thus can cause a problem here. The above command takes care of this also. @@ -78,7 +78,7 @@ readelf -l a.out | grep ': /lib' output of the last command will be (allowing for platform specific differences in dynamic linker name): -
[Requesting program interpreter: /lib/ld-linux.so.2]
+[Requesting program interpreter: /lib/ld-linux.so.2] Note especially that /lib is now the prefix of our dynamic linker. diff --git a/chapter06/revisedchroot.xml b/chapter06/revisedchroot.xml index 6424c53e5..c82675fec 100644 --- a/chapter06/revisedchroot.xml +++ b/chapter06/revisedchroot.xml @@ -28,7 +28,7 @@ remove the temporary copies of Tcl, Expect and DejaGNU, which were used for running the toolchain tests. If you want to use these programs later on, you will need to recompile and re-install them. The installation instructions are the same as in , apart from changing -the prefix from /tools to /usr. The +the prefix from /tools to /usr. The BLFS book discusses a slightly different approach to installing Tcl, see . diff --git a/chapter06/sed.xml b/chapter06/sed.xml index d6799c28c..976d7f90f 100644 --- a/chapter06/sed.xml +++ b/chapter06/sed.xml @@ -29,11 +29,10 @@ Diffutils, GCC, Gettext, Glibc, Grep, Make, Texinfo Installation of Sed A bug in this version of sed changes permissions on files modified using -the in-place function (-i flag). Apply a patch to ensure +the in-place function (-i flag). Apply a patch to ensure that the original file permissions are preserved. -patch -Np1 -i ../sed-&sed-version;-permissions-1.patch - +patch -Np1 -i ../sed-&sed-version;-permissions-1.patch Prepare Sed for compilation: diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml index 1ce985807..574a20d97 100644 --- a/chapter06/shadow.xml +++ b/chapter06/shadow.xml @@ -81,12 +81,12 @@ mv /usr/bin/passwd /bin mv /usr/lib/lib{shadow,misc}.so.0* /lib As some packages expect to find the just-moved libraries in -/usr/lib, create the following symlinks: +/usr/lib, create the following symlinks: ln -sf ../../lib/libshadow.so.0 /usr/lib/libshadow.so ln -sf ../../lib/libmisc.so.0 /usr/lib/libmisc.so -The -D option of the useradd program requires this +The -D option of the useradd program requires this directory for it to work properly: mkdir /etc/default @@ -415,7 +415,7 @@ shell, initial group, home directory, and the like.
-libmisc +libmisc libmisc ... @@ -423,7 +423,7 @@ shell, initial group, home directory, and the like. -libshadow +libshadow libshadow contains functions used by most programs in this package. diff --git a/chapter06/sysklogd.xml b/chapter06/sysklogd.xml index 097cd077a..6e659e204 100644 --- a/chapter06/sysklogd.xml +++ b/chapter06/sysklogd.xml @@ -60,7 +60,7 @@ Fix this bug by applying another patch: Create a new /etc/syslog.conf file by running the following: -cat > /etc/syslog.conf << "EOF" +cat > /etc/syslog.conf << "EOF" # Begin /etc/syslog.conf auth,authpriv.* -/var/log/auth.log @@ -72,7 +72,7 @@ user.* -/var/log/user.log *.emerg * # End /etc/syslog.conf -EOF +EOF diff --git a/chapter06/sysvinit.xml b/chapter06/sysvinit.xml index f39213f2e..3b487dbc6 100644 --- a/chapter06/sysvinit.xml +++ b/chapter06/sysvinit.xml @@ -28,10 +28,12 @@ running, and shutdown of your system. Installation of Sysvinit -Sysvinit &sysvinit-version; contains a "buffer overflow" bug. +Sysvinit &sysvinit-version; contains a buffer overflow bug. Under some conditions, it clobbers the values of environment variables. Fix that: + patch -Np1 -i ../sysvinit-&sysvinit-version;-proclen-1.patch + When run-levels are changed (for example, when halting the system), init sends termination signals to those processes that init itself started and that shouldn't be running in the new @@ -64,7 +66,7 @@ misinterpretation, you can modify the source so that these messages read like Create a new /etc/inittab file by running the following: -cat > /etc/inittab << "EOF" +cat > /etc/inittab << "EOF" # Begin /etc/inittab id:3:initdefault: @@ -91,9 +93,9 @@ su:S016:once:/sbin/sulogin 6:2345:respawn:/sbin/agetty -I '\033(K' tty6 9600 # End /etc/inittab -EOF +EOF - The -I '\033(K' switch tells agetty to send this escape sequence to + The -I '\033(K' switch tells agetty to send this escape sequence to the terminal before doing anything else. This escape sequence switches the console character set to a user-defined one, which can be modified by running the setfont program. @@ -121,7 +123,7 @@ killall5), poweroff (link to halt), reboot (link to halt), runlevel, shutdown, s halt halt -normally invokes shutdown with the -h flag, +normally invokes shutdown with the -h flag, except when already in run-level 0, then it tells the kernel to halt the system. But first it notes in the file /var/log/wtmp that the system is being brought down. @@ -188,7 +190,7 @@ messages to the current user's terminal. poweroff tells the kernel to halt the system and -switch off the computer. But see halt. +switch off the computer. But see halt. @@ -196,7 +198,7 @@ switch off the computer. But see halt. reboot reboot -tells the kernel to reboot the system. But see halt. +tells the kernel to reboot the system. But see halt. @@ -223,7 +225,7 @@ signaling all processes and notifying all logged-in users. sulogin allows the superuser to log in. It is -normally invoked by init when the system goes into single user mode. +normally invoked by init when the system goes into single user mode. @@ -231,7 +233,7 @@ normally invoked by init when the system goes into single user mode. telinit telinit -tells init which run-level to enter. +tells init which run-level to enter. diff --git a/chapter06/texinfo.xml b/chapter06/texinfo.xml index 4e16bf28c..c30698a90 100644 --- a/chapter06/texinfo.xml +++ b/chapter06/texinfo.xml @@ -52,7 +52,7 @@ Diffutils, GCC, Gettext, Glibc, Grep, Make, Ncurses, Sed -TEXMF=/usr/share/texmf +TEXMF=/usr/share/texmf The TEXMF makefile variable holds the location of the root of your TeX tree if, for example, you plan to install a TeX package later on. @@ -92,7 +92,8 @@ makeinfo, texi2dvi and texindex info is used to read Info documents. Info documents are a bit like man pages, but often go much deeper than just -explaining all the flags. Compare for example man tar and info tar. +explaining all the flags. Compare for example man tar +and info tar. diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml index fbd42374a..f7d4ff10f 100644 --- a/chapter06/util-linux.xml +++ b/chapter06/util-linux.xml @@ -30,8 +30,8 @@ Diffutils, GCC, Gettext, Glibc, Grep, Make, Ncurses, Sed, Zlib FHS compliance notes -The FHS recommends that we use /var/lib/hwclock, -instead of the usual /etc, as the location for the +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 program FHS-compliant, run the following: @@ -60,14 +60,14 @@ by applying the following patch: -HAVE_KILL=yes +HAVE_KILL=yes This prevents the kill program (already installed by Procps) from being built and installed again. -HAVE_SLN=yes +HAVE_SLN=yes This prevents the sln program (a statically linked ln already installed by Glibc) from being built and @@ -103,7 +103,7 @@ whereis and write agetty opens a tty port, prompts for a login name, -and then invokes the login program. +and then invokes the login program. @@ -344,7 +344,7 @@ Minix file system on the given device. mcookie generates magic cookies, 128-bit random hexadecimal numbers, -for xauth. +for xauth. @@ -394,7 +394,7 @@ for xauth. more is a filter for paging through text one -screen full at a time. But less is much better. +screen full at a time. But less is much better. diff --git a/chapter06/vim.xml b/chapter06/vim.xml index 7b978ffc7..415710124 100644 --- a/chapter06/vim.xml +++ b/chapter06/vim.xml @@ -49,7 +49,7 @@ echo '#define SYS_GVIMRC_FILE "/etc/gvimrc"' >> src/feature.h< ./configure --prefix=/usr --enable-multibyte The optional but highly recommended ---enable-multibyte switch +--enable-multibyte switch includes support for editing files in multibyte character encodings into vim. It is needed for those people who ignore our recommendation not to @@ -92,49 +92,49 @@ installed. For more information read the Vim documentation. By default, vim runs in vi-incompatible mode. Some people might not 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). We've included the setting of "nocompatible" +vi). We've included the setting of nocompatible below to high-light the fact that the new behavior is being used. It -also reminds those who would change to "compatible" mode that it should +also reminds those who would change to compatible mode that it should appear first because it changes other settings and overrides must come after this setting. Create a default vim configuration file by running the following: -cat > /etc/vimrc << "EOF" +cat > /etc/vimrc << "EOF" " Begin /etc/vimrc set nocompatible set backspace=2 syntax on - + if (&term == "iterm") || (&term == "putty") set background=dark endif " End /etc/vimrc -EOF +EOF -The set nocompatible makes +The set nocompatible makes vim behave in a more useful way (the default) than the -vi-compatible manner. Remove the "no" if you want the old vi -behavior. The set backspace=2 allows +vi-compatible manner. Remove the no if you want the old vi +behavior. The set backspace=2 allows backspacing over line breaks, autoindents and the start of insert. The -syntax on enables vim's +syntax on enables vim's syntax highliting. Finally, the if statement with the -set background=dark corrects vim's +set background=dark corrects vim's guess about the background color of some terminal emulators. This gives the highliting a better color scheme for use on the black background of these programs. @@ -164,7 +164,7 @@ vimtutor and xxd efm_filter.pl efm_filter.pl -is a filter for creating an error file that can be read by vim. +is a filter for creating an error file that can be read by vim. @@ -173,7 +173,7 @@ vimtutor and xxd efm_perl.pl reformats the error messages of the -Perl interpreter for use with the quickfix mode of vim. +Perl interpreter for use with the quickfix mode of vim. @@ -181,7 +181,7 @@ Perl interpreter for use with the quickfix mode of vim. ex ex -starts vim in ex mode. +starts vim in ex mode. @@ -189,7 +189,7 @@ Perl interpreter for use with the quickfix mode of vim. less.sh less.sh -is a script that starts vim with less.vim. +is a script that starts vim with less.vim. @@ -197,7 +197,7 @@ Perl interpreter for use with the quickfix mode of vim. mve.awk mve.awk -processes vim errors. +processes vim errors. @@ -205,7 +205,7 @@ Perl interpreter for use with the quickfix mode of vim. pltags.pl pltags.pl -creates a tags file for perl code, for use by vim. +creates a tags file for Perl code, for use by vim. @@ -221,8 +221,8 @@ Perl interpreter for use with the quickfix mode of vim. rview rview -is a restricted version of view: no shell -commands can be started and view can't be suspended. +is a restricted version of view: no shell +commands can be started and view can't be suspended. @@ -230,8 +230,8 @@ commands can be started and view can't be suspended. rvim rvim -is a restricted version of vim: no shell -commands can be started and vim can't be suspended. +is a restricted version of vim: no shell +commands can be started and vim can't be suspended. @@ -239,7 +239,7 @@ commands can be started and vim can't be suspended. shtags.pl shtags.pl -generates a tag file for perl scripts. +generates a tag file for Perl scripts. @@ -255,7 +255,7 @@ commands can be started and vim can't be suspended. view view -starts vim in read-only mode. +starts vim in read-only mode. @@ -271,7 +271,7 @@ commands can be started and vim can't be suspended. vim132 vim132 -starts vim with the terminal in 132-column mode. +starts vim with the terminal in 132-column mode. @@ -279,7 +279,7 @@ commands can be started and vim can't be suspended. vim2html.pl vim2html.pl -converts vim documentation to HTML. +converts Vim documentation to HTML. @@ -287,7 +287,7 @@ commands can be started and vim can't be suspended. vimdiff vimdiff -edits two or three versions of a file with vim and show differences. +edits two or three versions of a file with vim and show differences. @@ -304,7 +304,7 @@ commands can be started and vim can't be suspended. vimspell.sh is a script which spells a file and generates the syntax statements necessary -to highlight in vim. This script requires the old Unix spell +to highlight in vim. This script requires the old Unix spell command, which is provided neither in LFS nor in BLFS. @@ -313,7 +313,7 @@ command, which is provided neither in LFS nor in BLFS. vimtutor vimtutor -teaches you the basic keys and commands of vim. +teaches you the basic keys and commands of vim. diff --git a/chapter06/zlib.xml b/chapter06/zlib.xml index fe893e2c3..8aa195b62 100644 --- a/chapter06/zlib.xml +++ b/chapter06/zlib.xml @@ -30,7 +30,7 @@ some programs. Zlib is known to build its shared library incorrectly if CFLAGS is specified in the environment. If you are using your own CFLAGS variable, be -sure to add the -fPIC directive to your CFLAGS for the +sure to add the -fPIC directive to your CFLAGS for the duration of the below configure command, then remove it afterwards. @@ -50,6 +50,7 @@ afterwards. make install Now also build the non-shared (static) library: + make clean ./configure --prefix=/usr make @@ -80,7 +81,7 @@ into /lib: mv /usr/lib/libz.so.* /lib -Now we need to fix the /usr/lib/libz.so symlink +Now we need to fix the /usr/lib/libz.so symlink because we just moved the file it points to: ln -sf ../../lib/libz.so.1 /usr/lib/libz.so @@ -98,7 +99,7 @@ because we just moved the file it points to: Short description -libz* +libz* libz* contains compression and un-compression -- cgit v1.2.3-54-g00ecf