diff options
| author | Matthew Burgess <matthew@linuxfromscratch.org> | 2013-02-11 20:09:22 +0000 |
|---|---|---|
| committer | Matthew Burgess <matthew@linuxfromscratch.org> | 2013-02-11 20:09:22 +0000 |
| commit | 2ca8941c1fd5739874e4c29bd5ad176b21587a3d (patch) | |
| tree | 1b004a17a2583b2df6608c2e47870b73f102b5ee | |
| parent | c0220ed5ba7ba1e225c98fa61ada101103548bf3 (diff) | |
Remove trailing whitespace from all files.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10121 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
56 files changed, 294 insertions, 294 deletions
diff --git a/appendices/acknowledgments.xml b/appendices/acknowledgments.xml index c9d509e69..607bf7bf6 100644 --- a/appendices/acknowledgments.xml +++ b/appendices/acknowledgments.xml @@ -30,7 +30,7 @@ <listitem> <para><ulink url="mailto:bdubbs@linuxfromscratch.org">Bruce - Dubbs</ulink> <bdubbs@linuxfromscratch.org> – LFS Release + Dubbs</ulink> <bdubbs@linuxfromscratch.org> – LFS Release Manager, LFS Technical Writer/Editor</para> </listitem> @@ -146,7 +146,7 @@ </listitem> <listitem> - <para><ulink url="mailto:lfalcon@thymbra.com">Luis Falcon</ulink> + <para><ulink url="mailto:lfalcon@thymbra.com">Luis Falcon</ulink> <Luis Falcon> – torredehanoi.org mirror</para> </listitem> @@ -234,12 +234,12 @@ </listitem> <listitem> - <para><ulink url="mailto:info@shizu-net.jp">Shizunet Co.,Ltd.</ulink> + <para><ulink url="mailto:info@shizu-net.jp">Shizunet Co.,Ltd.</ulink> <info@shizu-net.jp> – lfs.mirror.shizu-net.jp mirror</para> </listitem> <listitem> - <para><ulink url="http://www.initworld.com/">Init World</ulink> + <para><ulink url="http://www.initworld.com/">Init World</ulink> <http://www.initworld.com/> – lfs.initworld.com mirror</para> </listitem> @@ -344,7 +344,7 @@ <listitem> <para><ulink url="mailto:alexander@linuxfromscratch.org">Alexander E. Patrakov</ulink> <alexander@linuxfromscratch.org> – LFS - Technical Writer, LFS Internationalization Editor, + Technical Writer, LFS Internationalization Editor, LFS Live CD Maintainer</para> </listitem> diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml index f7c957c88..841887828 100644 --- a/appendices/dependencies.xml +++ b/appendices/dependencies.xml @@ -29,7 +29,7 @@ built in a certain order, this could result in paths of /tools/bin/[binary] being placed inside scripts installed to the final system. This is obviously not desirable.</para> - + <para>The last list of dependencies are optional packages that are not addressed in LFS, but could be useful to the user. These packages may have additional mandatory or optional dependencies of their own. For these @@ -837,7 +837,7 @@ <segtitle>&dependencies;</segtitle> <seglistitem> - <seg>Bash, Binutils, Bison, Coreutils, Diffutils, GCC, Gettext, Glibc, + <seg>Bash, Binutils, Bison, Coreutils, Diffutils, GCC, Gettext, Glibc, Grep, Make, Ncurses, Sed, Texinfo, and Xz</seg> </seglistitem> </segmentedlist> @@ -1555,7 +1555,7 @@ <segtitle>&dependencies;</segtitle> <seglistitem> - <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make, + <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make, Popt, and Sed</seg> </seglistitem> </segmentedlist> diff --git a/appendices/scripts.xml b/appendices/scripts.xml index c5f299870..30f63752b 100644 --- a/appendices/scripts.xml +++ b/appendices/scripts.xml @@ -2,34 +2,34 @@ <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ <!ENTITY % general-entities SYSTEM "../general.ent"> - <!ENTITY checkfs SYSTEM "checkfs.script"> - <!ENTITY cleanfs SYSTEM "cleanfs.script"> - <!ENTITY console SYSTEM "console.script"> - <!ENTITY functions SYSTEM "functions.script"> - <!ENTITY halt SYSTEM "halt.script"> - <!ENTITY initfunctions SYSTEM "init-functions.script"> - <!ENTITY localnet SYSTEM "localnet.script"> - <!ENTITY modules SYSTEM "modules.script"> - <!ENTITY mountfs SYSTEM "mountfs.script"> - <!ENTITY mountvirtfs SYSTEM "mountvirtfs.script"> - <!ENTITY network SYSTEM "network.script"> - <!ENTITY rc SYSTEM "rc.script"> - <!ENTITY reboot SYSTEM "reboot.script"> - <!ENTITY sendsignals SYSTEM "sendsignals.script"> - <!ENTITY setclock SYSTEM "setclock.script"> - <!ENTITY swap SYSTEM "swap.script"> - <!ENTITY sysctl SYSTEM "sysctl.script"> - <!ENTITY sysklogd SYSTEM "sysklogd.script"> - <!ENTITY template SYSTEM "template.script"> - <!ENTITY udev SYSTEM "udev.script"> - <!ENTITY udev_retry SYSTEM "udev_retry.script"> - <!ENTITY createfiles SYSTEM "createfiles.script"> - <!ENTITY modules_sys SYSTEM "modules-sysinit.script"> - <!ENTITY cfg_udev_retry SYSTEM "config-udev-retry.script"> - <!ENTITY ifup SYSTEM "ifup.script"> - <!ENTITY ifdown SYSTEM "ifdown.script"> - <!ENTITY ipv4_static SYSTEM "ipv4-static.script"> - <!ENTITY ipv4_static_route SYSTEM "ipv4-static-route.script"> + <!ENTITY checkfs SYSTEM "checkfs.script"> + <!ENTITY cleanfs SYSTEM "cleanfs.script"> + <!ENTITY console SYSTEM "console.script"> + <!ENTITY functions SYSTEM "functions.script"> + <!ENTITY halt SYSTEM "halt.script"> + <!ENTITY initfunctions SYSTEM "init-functions.script"> + <!ENTITY localnet SYSTEM "localnet.script"> + <!ENTITY modules SYSTEM "modules.script"> + <!ENTITY mountfs SYSTEM "mountfs.script"> + <!ENTITY mountvirtfs SYSTEM "mountvirtfs.script"> + <!ENTITY network SYSTEM "network.script"> + <!ENTITY rc SYSTEM "rc.script"> + <!ENTITY reboot SYSTEM "reboot.script"> + <!ENTITY sendsignals SYSTEM "sendsignals.script"> + <!ENTITY setclock SYSTEM "setclock.script"> + <!ENTITY swap SYSTEM "swap.script"> + <!ENTITY sysctl SYSTEM "sysctl.script"> + <!ENTITY sysklogd SYSTEM "sysklogd.script"> + <!ENTITY template SYSTEM "template.script"> + <!ENTITY udev SYSTEM "udev.script"> + <!ENTITY udev_retry SYSTEM "udev_retry.script"> + <!ENTITY createfiles SYSTEM "createfiles.script"> + <!ENTITY modules_sys SYSTEM "modules-sysinit.script"> + <!ENTITY cfg_udev_retry SYSTEM "config-udev-retry.script"> + <!ENTITY ifup SYSTEM "ifup.script"> + <!ENTITY ifdown SYSTEM "ifdown.script"> + <!ENTITY ipv4_static SYSTEM "ipv4-static.script"> + <!ENTITY ipv4_static_route SYSTEM "ipv4-static-route.script"> %general-entities; ]> @@ -51,145 +51,145 @@ <sect1 id="rc" role="wrap"> <title>/etc/rc.d/init.d/rc</title> - <para>The <systemitem>rc</systemitem> script is the first script called by + <para>The <systemitem>rc</systemitem> script is the first script called by <application>init</application> and initiates the boot process.</para> - <screen>&rc;</screen> + <screen>&rc;</screen> </sect1> <sect1 id="init-functions" role="wrap"> <title>/lib/lsb/init-functions</title> - <screen>&initfunctions;</screen> + <screen>&initfunctions;</screen> </sect1> <sect1 id="functions" role="wrap"> <title>/etc/rc.d/init.d/functions</title> - <screen>&functions;</screen> + <screen>&functions;</screen> </sect1> <sect1 id="mountvirtfs" role="wrap"> <title>/etc/rc.d/init.d/mountvirtfs</title> - <screen>&mountvirtfs;</screen> + <screen>&mountvirtfs;</screen> </sect1> <sect1 id="modules" role="wrap"> <title>/etc/rc.d/init.d/modules</title> - <screen>&modules;</screen> + <screen>&modules;</screen> </sect1> <sect1 id="udev" role="wrap"> <title>/etc/rc.d/init.d/udev</title> - <screen>&udev;</screen> + <screen>&udev;</screen> </sect1> <sect1 id="swap" role="wrap"> <title>/etc/rc.d/init.d/swap</title> - <screen>&swap;</screen> + <screen>&swap;</screen> </sect1> <sect1 id="setclock" role="wrap"> <title>/etc/rc.d/init.d/setclock</title> - <screen>&setclock;</screen> + <screen>&setclock;</screen> </sect1> <sect1 id="checkfs" role="wrap"> <title>/etc/rc.d/init.d/checkfs</title> - <screen>&checkfs;</screen> + <screen>&checkfs;</screen> </sect1> <sect1 id="mountfs" role="wrap"> <title>/etc/rc.d/init.d/mountfs</title> - <screen>&mountfs;</screen> + <screen>&mountfs;</screen> </sect1> <sect1 id="udev_retry" role="wrap"> <title>/etc/rc.d/init.d/udev_retry</title> - <screen>&udev_retry;</screen> + <screen>&udev_retry;</screen> </sect1> <sect1 id="cleanfs" role="wrap"> <title>/etc/rc.d/init.d/cleanfs</title> - <screen>&cleanfs;</screen> + <screen>&cleanfs;</screen> </sect1> <sect1 id="console" role="wrap"> <title>/etc/rc.d/init.d/console</title> - <screen>&console;</screen> + <screen>&console;</screen> </sect1> <sect1 id="localnet" role="wrap"> <title>/etc/rc.d/init.d/localnet</title> - <screen>&localnet;</screen> + <screen>&localnet;</screen> </sect1> <sect1 id="sysctlscript" role="wrap"> <title>/etc/rc.d/init.d/sysctl</title> - <screen>&sysctl;</screen> + <screen>&sysctl;</screen> </sect1> <sect1 id="sysklogd" role="wrap"> <title>/etc/rc.d/init.d/sysklogd</title> - <screen>&sysklogd;</screen> + <screen>&sysklogd;</screen> </sect1> <sect1 id="network" role="wrap"> <title>/etc/rc.d/init.d/network</title> - <screen>&network;</screen> + <screen>&network;</screen> </sect1> <sect1 id="sendsignals" role="wrap"> <title>/etc/rc.d/init.d/sendsignals</title> - <screen>&sendsignals;</screen> + <screen>&sendsignals;</screen> </sect1> <sect1 id="rebootscript" role="wrap"> <title>/etc/rc.d/init.d/reboot</title> - <screen>&reboot;</screen> + <screen>&reboot;</screen> </sect1> <sect1 id="haltscript" role="wrap"> <title>/etc/rc.d/init.d/halt</title> - <screen>&halt;</screen> + <screen>&halt;</screen> </sect1> <sect1 id="template" role="wrap"> <title>/etc/rc.d/init.d/template</title> - <screen>&template;</screen> + <screen>&template;</screen> </sect1> <sect1 id="modulessys" role="wrap"> <title>/etc/sysconfig/modules</title> - <screen>&modules_sys;</screen> + <screen>&modules_sys;</screen> </sect1> <sect1 id="createfiles" role="wrap"> <title>/etc/sysconfig/createfiles</title> - <screen>&createfiles;</screen> + <screen>&createfiles;</screen> </sect1> <sect1 id="config-udev-retry" role="wrap"> <title>/etc/sysconfig/udev-retry</title> - <screen>&cfg_udev_retry;</screen> + <screen>&cfg_udev_retry;</screen> </sect1> <sect1 id="ifup" role="wrap"> <title>/sbin/ifup</title> - <screen>&ifup;</screen> + <screen>&ifup;</screen> </sect1> <sect1 id="ifdown" role="wrap"> <title>/sbin/ifdown</title> - <screen>&ifdown;</screen> + <screen>&ifdown;</screen> </sect1> <sect1 id="ipv4static" role="wrap"> <title>/lib/services/ipv4-static</title> - <screen>&ipv4_static;</screen> + <screen>&ipv4_static;</screen> </sect1> <sect1 id="ipv4route" role="wrap"> <title>/lib/services/ipv4-static-route</title> - <screen>&ipv4_static_route;</screen> + <screen>&ipv4_static_route;</screen> </sect1> </appendix> diff --git a/appendices/udev-rules.xml b/appendices/udev-rules.xml index 2549e5fc9..abb7f8846 100644 --- a/appendices/udev-rules.xml +++ b/appendices/udev-rules.xml @@ -2,7 +2,7 @@ <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ <!ENTITY % general-entities SYSTEM "../general.ent"> - <!ENTITY lfs-rules SYSTEM "55-lfs.rules.script"> + <!ENTITY lfs-rules SYSTEM "55-lfs.rules.script"> %general-entities; ]> @@ -18,7 +18,7 @@ <sect1 id="lfsrules" role="wrap"> <title>55-lfs.rules</title> - <screen>&lfs-rules;</screen> + <screen>&lfs-rules;</screen> </sect1> </appendix> diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index c6e68dc50..4c3aa4d87 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -85,7 +85,7 @@ <para>2013-01-24</para> <itemizedlist> <listitem> - <para>[bdubbs] - Remove bashisms from init-functions + <para>[bdubbs] - Remove bashisms from init-functions file in the boot scripts. </para> </listitem> </itemizedlist> @@ -140,7 +140,7 @@ </listitem> <listitem> <para>[bdubbs] - Update udev-lfs init-net-rules.sh - script for "en*" devices introduced in systemd-197. + script for "en*" devices introduced in systemd-197. </para> </listitem> </itemizedlist> @@ -217,7 +217,7 @@ <ulink url="&lfs-ticket-root;3264">#3264</ulink>.</para> </listitem> <listitem> - <para>[bdubbs] - Fix the location for mounting /dev/shm + <para>[bdubbs] - Fix the location for mounting /dev/shm inside chroot. Fixes <ulink url="&lfs-ticket-root;3258">#3258</ulink>.</para> </listitem> @@ -508,7 +508,7 @@ <itemizedlist> <listitem> <para>[bdubbs] - Add notes to the gcc and binutils - sections in Chapter 6 about "link time optimization" + sections in Chapter 6 about "link time optimization" and the extra files built by gcc. Fixes <ulink url="&lfs-ticket-root;3200">#3200</ulink>.</para> </listitem> @@ -518,8 +518,8 @@ </listitem> <listitem> <para>[bdubbs] - Update installed program description - for several packages. Thanks to Chris Staub for the patch. - Fixes <ulink url="&lfs-ticket-root;3203">#3203</ulink>.</para> + for several packages. Thanks to Chris Staub for the patch. + Fixes <ulink url="&lfs-ticket-root;3203">#3203</ulink>.</para> </listitem> </itemizedlist> </listitem> @@ -528,27 +528,27 @@ <para>2012-10-14</para> <itemizedlist> <listitem> - <para>[bdubbs] - Remove utmpdump from sysvinit + <para>[bdubbs] - Remove utmpdump from sysvinit because it is now installed by util-linux. Thanks to Chris Staub for the patch. Fixes - <ulink url="&lfs-ticket-root;3202">#3202</ulink>.</para> + <ulink url="&lfs-ticket-root;3202">#3202</ulink>.</para> </listitem> <listitem> <para>[bdubbs] - Change procps to not install the kill program that is now installed by util-linux. Fixes - <ulink url="&lfs-ticket-root;3201">#3201</ulink>.</para> + <ulink url="&lfs-ticket-root;3201">#3201</ulink>.</para> </listitem> <listitem> <para>[bdubbs] - Update to util-linux-2.22.1. Fixes - <ulink url="&lfs-ticket-root;3199">#3199</ulink>.</para> + <ulink url="&lfs-ticket-root;3199">#3199</ulink>.</para> </listitem> <listitem> <para>[bdubbs] - Update to linux-3.6.2. Fixes - <ulink url="&lfs-ticket-root;3198">#3198</ulink>.</para> + <ulink url="&lfs-ticket-root;3198">#3198</ulink>.</para> </listitem> <listitem> <para>[bdubbs] - Add boot/shutdown script customization - instructions.</para> + instructions.</para> </listitem> </itemizedlist> </listitem> @@ -666,7 +666,7 @@ <para>2012-09-05</para> <itemizedlist> <listitem> - <para>[bdubbs] - Add udevadm trigger --action=change line + <para>[bdubbs] - Add udevadm trigger --action=change line to udev script to support initramfs better.</para> </listitem> </itemizedlist> @@ -676,7 +676,7 @@ <para>2012-09-04</para> <itemizedlist> <listitem> - <para>[bdubbs] - Update grub packages and naming + <para>[bdubbs] - Update grub packages and naming conventions example.</para> </listitem> <listitem> diff --git a/chapter02/creatingpartition.xml b/chapter02/creatingpartition.xml index 7bb2a9ef5..d9e58f184 100644 --- a/chapter02/creatingpartition.xml +++ b/chapter02/creatingpartition.xml @@ -75,87 +75,87 @@ <sect2> <title>Other Partition Issues</title> - <para>Requests for advice on system partitioning are often posted on the LFS mailing + <para>Requests for advice on system partitioning are often posted on the LFS mailing lists. This is a highly subjective topic. The default for most distributions is to use the entire drive with the exception of one small swap partition. This - is not optimal for LFS for several reasons. It reduces flexibility, makes + is not optimal for LFS for several reasons. It reduces flexibility, makes sharing of data across multiple distributions or LFS builds more difficult, makes - backups more time consuming, and can waste disk space through inefficient + backups more time consuming, and can waste disk space through inefficient allocation of file system structures.</para> <sect3> <title>The Root Partition</title> - + <para>A root LFS partition (not to be confused with the <filename class="directory">/root</filename> directory) of ten gigabytes is a good compromise for most systems. It provides enough space to build LFS and most of BLFS, but is small enough so that multiple partitions can be easily created for experimentation.</para> </sect3> - + <sect3> <title>The Swap Partition</title> - + <para>Most distributions automatically create a swap partition. Generally the recommended size of the swap partition is about twice the amount of physical RAM, however this is rarely needed. If disk space is limited, hold the swap partition to two gigabytes and monitor the amount of disk swapping.</para> - + <para>Swapping is never good. Generally you can tell if a system is swapping by just listening to disk activity and observing how the system reacts to commands. The first reaction to swapping should be to check for an unreasonable command such as trying to edit a five gigabyte file. If swapping becomes a normal occurrence, the best solution is to purchase more RAM for your system.</para> </sect3> - + <sect3> <title>Convenience Partitions</title> - + <para>There are several other partitions that are not required, but should be considered when designing a disk layout. The following list is not comprehensive, but is meant as a guide.</para> - + <itemizedlist> - + <listitem><para>/boot – Highly recommended. Use this partition to store kernels and other booting information. To minimize potential boot problems with larger disks, make this the first physical partition on your first disk drive. A partition size of 100 megabytes is quite adequate.</para></listitem> - + <listitem><para>/home – Highly recommended. Share your home directory and user customization across multiple distributions or LFS builds. The size is generally fairly large and depends on available disk space.</para></listitem> - + <listitem><para>/usr – A separate /usr partition is generally used if providing a server for a thin client or diskless workstation. It is normally not needed for LFS. A size of five gigabytes will handle most installations.</para></listitem> - + <listitem><para>/opt – This directory is most useful for BLFS where multiple installations of large packages like Gnome or KDE can be installed without embedding the files in the /usr hierarchy. If used, 5 to 10 gigabytes is generally adequate.</para> </listitem> - + <listitem><para>/tmp – A separate /tmp directory is rare, but useful if configuring a thin client. This partition, if used, will usually not need to exceed a couple of gigabytes.</para></listitem> - + <listitem><para>/usr/src – This partition is very useful for providing a location to store BLFS source files and share them across LFS builds. It can also be used as a location for building BLFS packages. A reasonably large partition of 30-50 gigabytes allows plenty of room.</para></listitem> - + </itemizedlist> - + <para>Any separate partition that you want automatically mounted upon boot needs to be specified in the <filename>/etc/fstab</filename>. Details about how to specify partitions will be discussed in <xref linkend="ch-bootable-fstab"/>. </para> - + </sect3> </sect2> </sect1> diff --git a/chapter03/introduction.xml b/chapter03/introduction.xml index 58df880cc..98fc93e62 100644 --- a/chapter03/introduction.xml +++ b/chapter03/introduction.xml @@ -53,15 +53,15 @@ <ulink url="../wget-list">wget-list</ulink> as an input to <command>wget</command>. For example:</para> -<screen role="nodump"><userinput>wget -i wget-list -P $LFS/sources</userinput></screen> +<screen role="nodump"><userinput>wget -i wget-list -P $LFS/sources</userinput></screen> - <para>Additionally, starting with LFS-7.0, there is a separate file, + <para>Additionally, starting with LFS-7.0, there is a separate file, <ulink url="../md5sums">md5sums</ulink>, can be used to verify that all - the correct packages are available before proceeding. Place that file in + the correct packages are available before proceeding. Place that file in <filename class="directory">$LFS/sources</filename> and run:</para> <screen role="nodump"><userinput>pushd $LFS/sources md5sum -c md5sums -popd</userinput></screen> +popd</userinput></screen> </sect1> diff --git a/chapter05/adjusting.xml b/chapter05/adjusting.xml index 7372e4cdd..7179233d2 100644 --- a/chapter05/adjusting.xml +++ b/chapter05/adjusting.xml @@ -36,7 +36,7 @@ <screen><userinput>SPECS=`dirname $($LFS_TGT-gcc -print-libgcc-file-name)`/specs $LFS_TGT-gcc -dumpspecs | sed \ -e 's@/lib\(64\)\?/ld@/tools&@g' \ - -e "/^\*cpp:$/{n;s,$, -isystem /tools/include,}" > $SPECS + -e "/^\*cpp:$/{n;s,$, -isystem /tools/include,}" > $SPECS echo "New specs file is: $SPECS" unset SPECS</userinput></screen> diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml index a396780ef..decec8b6f 100644 --- a/chapter05/binutils-pass1.xml +++ b/chapter05/binutils-pass1.xml @@ -43,7 +43,7 @@ <sect2 role="installation"> <title>Installation of Cross Binutils</title> - <note><para>Go back and re-read the notes in the previous section. + <note><para>Go back and re-read the notes in the previous section. Understanding the notes labeled important will save you a lot of problems later.</para></note> @@ -126,7 +126,7 @@ cd ../binutils-build</userinput></screen> temporary tools.</para> </listitem> </varlistentry> - + <varlistentry> <term><parameter>--disable-werror</parameter></term> <listitem> diff --git a/chapter05/check.xml b/chapter05/check.xml index e8c7bafcd..a805bfab5 100644 --- a/chapter05/check.xml +++ b/chapter05/check.xml @@ -54,7 +54,7 @@ <screen><userinput remap="test">make check</userinput></screen> - <para>Note that the Check test suite may take a relatively long + <para>Note that the Check test suite may take a relatively long (up to 4 SBU) time.</para> <para>Install the package:</para> diff --git a/chapter05/e2fsprogs.xml b/chapter05/e2fsprogs.xml index a8f111b14..9ebbba792 100644 --- a/chapter05/e2fsprogs.xml +++ b/chapter05/e2fsprogs.xml @@ -80,7 +80,7 @@ cd build</userinput></screen> <screen><userinput remap="install">make install-libs</userinput></screen> - <para>Make the installed static libraries writable so debugging symbols can + <para>Make the installed static libraries writable so debugging symbols can be removed later:</para> <screen><userinput remap="install">chmod -v u+w \ diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml index 9bbca7839..6c936debc 100644 --- a/chapter05/gcc-pass2.xml +++ b/chapter05/gcc-pass2.xml @@ -62,7 +62,7 @@ <option>-fomit-frame-pointer</option> compiler flag. Non-bootstrap builds omit this flag by default, and the goal should be to produce a compiler that is exactly the same as if it were bootstrapped. Apply the following - <command>sed</command> command to force the build to use the flag:</para> + <command>sed</command> command to force the build to use the flag:</para> <screen><userinput remap="pre">cp -v gcc/Makefile.in{,.tmp} sed 's/^T_CFLAGS =$/& -fomit-frame-pointer/' gcc/Makefile.in.tmp \ @@ -189,7 +189,7 @@ RANLIB=$LFS_TGT-ranlib \ iterations are compared to make sure it can reproduce itself flawlessly. This also implies that it was compiled correctly. However, the LFS build method should provide a solid compiler - without the need to bootstrap each time.</para> + without the need to bootstrap each time.</para> </listitem> </varlistentry> diff --git a/chapter05/generalinstructions.xml b/chapter05/generalinstructions.xml index c1caca30b..72f460066 100644 --- a/chapter05/generalinstructions.xml +++ b/chapter05/generalinstructions.xml @@ -10,7 +10,7 @@ <title>General Compilation Instructions</title> - <para>When building packages there are several assumptions made within + <para>When building packages there are several assumptions made within the instructions:</para> <itemizedlist> @@ -55,12 +55,12 @@ <para>The build instructions assume that the <xref linkend='pre-hostreqs'/>, including symbolic links, have been set properly:</para> - + <itemizedlist role='important'> <listitem override='bullet'><para><command>bash</command> is the shell in use.</para></listitem> - + <listitem override='bullet'><para><command>sh</command> is a symbolic link to <command>bash</command>.</para></listitem> @@ -93,7 +93,7 @@ <orderedlist numeration="loweralpha" spacing="compact"> <listitem> <para>Using the <command>tar</command> program, extract the package - to be built. In Chapter 5, ensure you are the <emphasis>lfs</emphasis> + to be built. In Chapter 5, ensure you are the <emphasis>lfs</emphasis> user when extracting the package.</para> </listitem> <listitem> diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml index 9af9bafd8..642532c87 100644 --- a/chapter05/glibc.xml +++ b/chapter05/glibc.xml @@ -47,7 +47,7 @@ installed properly. Test to see if they are installed in the host system and install if they are not:</para> -<screen><userinput remap="pre">if [ ! -r /usr/include/rpc/types.h ]; then +<screen><userinput remap="pre">if [ ! -r /usr/include/rpc/types.h ]; then su -c 'mkdir -p /usr/include/rpc' su -c 'cp -v sunrpc/rpc/*.h /usr/include/rpc' fi</userinput></screen> diff --git a/chapter05/linux-headers.xml b/chapter05/linux-headers.xml index 04340f80c..b1a0652aa 100644 --- a/chapter05/linux-headers.xml +++ b/chapter05/linux-headers.xml @@ -55,7 +55,7 @@ <para>Now test and extract the user-visible kernel headers from the source. They are placed in an intermediate local directory and copied to the needed - location because the extraction process removes any existing files in + location because the extraction process removes any existing files in the target directory.</para> <screen><userinput remap="make">make headers_check diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml index 779ea5924..8067b05c5 100644 --- a/chapter06/coreutils.xml +++ b/chapter06/coreutils.xml @@ -151,7 +151,7 @@ sed -i s/\"1\"/\"8\"/1 /usr/share/man/man8/chroot.8</userinput></screen> id, install, join, link, ln, logname, ls, md5sum, mkdir, mkfifo, mknod, mktemp, mv, nice, nl, nohup, nproc, od, paste, pathchk, pinky, pr, printenv, printf, ptx, pwd, readlink, realpath, rm, rmdir, runcon, seq, - sha1sum, sha224sum, sha256sum, sha384sum, sha512sum, shred, shuf, sleep, + sha1sum, sha224sum, sha256sum, sha384sum, sha512sum, shred, shuf, sleep, sort, split, stat, stdbuf, stty, sum, sync, tac, tail, tee, test, timeout, touch, tr, true, truncate, tsort, tty, uname, unexpand, uniq, unlink, users, vdir, wc, who, whoami, and yes</seg> diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml index 59a98e83b..b9c4ec8b1 100644 --- a/chapter06/e2fsprogs.xml +++ b/chapter06/e2fsprogs.xml @@ -25,7 +25,7 @@ <para>The E2fsprogs package contains the utilities for handling the <systemitem class="filesystem">ext2</systemitem> file system. It also - supports the <systemitem class="filesystem">ext3</systemitem> and + supports the <systemitem class="filesystem">ext3</systemitem> and <systemitem class="filesystem">ext4</systemitem> journaling file systems.</para> @@ -129,7 +129,7 @@ cd build</userinput></screen> <screen><userinput remap="install">make install-libs</userinput></screen> - <para>Make the installed static libraries writable so debugging symbols can + <para>Make the installed static libraries writable so debugging symbols can be removed later:</para> <screen><userinput remap="install">chmod -v u+w /usr/lib/{libcom_err,libe2p,libext2fs,libss}.a</userinput></screen> @@ -296,8 +296,8 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin <varlistentry id="e2undo"> <term><command>e2undo</command></term> <listitem> - <para>Replays the undo log undo_log for an ext2/ext3/ext4 filesystem - found on a device. This can be used to undo a failed operation by an + <para>Replays the undo log undo_log for an ext2/ext3/ext4 filesystem + found on a device. This can be used to undo a failed operation by an e2fsprogs program.</para> <indexterm zone="ch-system-e2fsprogs e2undo"> <primary sortas="b-e2undo">e2undo</primary> @@ -362,7 +362,7 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin <term><command>fsck.ext4dev</command></term> <listitem> <para>By default checks <systemitem class="filesystem">ext4</systemitem> - development file systems. This is a hard link to + development file systems. This is a hard link to <command>e2fsck</command>.</para> <indexterm zone="ch-system-e2fsprogs fsck.ext4dev"> <primary sortas="b-fsck.ext4dev">fsck.ext4dev</primary> diff --git a/chapter06/flex.xml b/chapter06/flex.xml index 8f97a7c9d..a331d669c 100644 --- a/chapter06/flex.xml +++ b/chapter06/flex.xml @@ -122,7 +122,7 @@ chmod -v 755 /usr/bin/lex</userinput></screen> <varlistentry id="flexpp"> <term><command>flex++</command></term> <listitem> - <para>An extension of flex, is used for generating C++ code + <para>An extension of flex, is used for generating C++ code and classes. It is a symbolic link to <command>flex</command></para> <indexterm zone="ch-system-flex flexpp"> <primary sortas="b-flex++">flex++</primary> diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml index e6909b7df..f15144dae 100644 --- a/chapter06/gcc.xml +++ b/chapter06/gcc.xml @@ -51,7 +51,7 @@ <para>As in <xref linkend="ch-tools-gcc-pass2"/>, apply the following <command>sed</command> to force the build to use the <option>-fomit-frame-pointer</option> compiler flag in order to ensure - consistent compiler builds:</para> + consistent compiler builds:</para> <screen><userinput remap="pre">case `uname -m` in i?86) sed -i 's/^T_CFLAGS =$/& -fomit-frame-pointer/' gcc/Makefile.in ;; @@ -101,9 +101,9 @@ cd ../gcc-build</userinput></screen> <option>--enable-lto</option>, that can be used to allow <command>gcc</command> to do do "link time optimization" if specified. No packages in LFS or BLFS currently use this capability.</para> - + <para>To use this feature, it must also be enabled in - <application>binutils</application>.</para> + <application>binutils</application>.</para> </note> <para>Compile the package:</para> @@ -311,14 +311,14 @@ mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib</userinput></screen> <segtitle>Installed directories</segtitle> <seglistitem> - <seg>c++, cc (link to gcc), cpp, g++, gcc, + <seg>c++, cc (link to gcc), cpp, g++, gcc, gcc-ar, gcc-nm, gcc-ranlib, gccbug, and gcov</seg> <seg>libgcc.a, libgcc_eh.a, libgcc_s.so, libgcov.a, libgomp.{a,so}, liblto_plugin.so, libmudflap.{a,so}, libmudflapth.{a,so}, libquadmath.{a,so}, libssp.{a,so}, libssp_nonshared.a, libstdc++.{a,so} and libsupc++.a</seg> - + <seg>/usr/include/c++, /usr/lib/gcc, /usr/share/gcc-&gcc-version;</seg> </seglistitem> </segmentedlist> diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml index 80bd4cf60..449f3a76a 100644 --- a/chapter06/glibc.xml +++ b/chapter06/glibc.xml @@ -115,8 +115,8 @@ grep Error glibc-check-log</userinput></screen> <listitem> <para>The <emphasis>nptl/tst-clock2</emphasis>, - <emphasis>nptl/tst-attr3</emphasis>, - <emphasis>tst/tst-cputimer1</emphasis>, and + <emphasis>nptl/tst-attr3</emphasis>, + <emphasis>tst/tst-cputimer1</emphasis>, and <emphasis>rt/tst-cpuclock2</emphasis> tests have been known to fail. The reason is not completely understood, but indications are that minor @@ -128,20 +128,20 @@ grep Error glibc-check-log</userinput></screen> systems where the CPU is not a relatively new genuine Intel or authentic AMD processor.</para> </listitem> - + <listitem> <para>When running on older and slower hardware or on systems under load, some tests can fail because of test timeouts being exceeded. - Modifying the make check command to set a TIMEOUTFACTOR is reported to + Modifying the make check command to set a TIMEOUTFACTOR is reported to help eliminate these errors (e.g. <command>TIMEOUTFACTOR=16 make -k check</command>).</para> </listitem> - + <listitem> - <para>Other tests known to fail on some architectures are posix/bug-regex32, + <para>Other tests known to fail on some architectures are posix/bug-regex32, misc/tst-writev, elf/check-textrel, nptl/tst-getpid2, and stdio-common/bug22.</para> </listitem> - + </itemizedlist> <para>Though it is a harmless message, the install stage of Glibc will @@ -155,7 +155,7 @@ grep Error glibc-check-log</userinput></screen> <screen><userinput remap="install">make install</userinput></screen> <para>Install NIS and RPC related headers that are not installed by - default; these are required to rebuild glibc and by several BLFS + default; these are required to rebuild glibc and by several BLFS packages:</para> <screen><userinput remap="install">cp -v ../glibc-&glibc-version;/sunrpc/rpc/*.h /usr/include/rpc @@ -259,13 +259,13 @@ EOF</userinput></screen> <screen><userinput>tar -xf ../tzdata&tzdata-version;.tar.gz ZONEINFO=/usr/share/zoneinfo -mkdir -pv $ZONEINFO/{posix,right} +mkdir -pv $ZONEINFO/{posix,right} for tz in etcetera southamerica northamerica europe africa antarctica \ asia australasia backward pacificnew solar87 solar88 solar89 \ systemv; do - zic -L /dev/null -d $ZONEINFO -y "sh yearistype.sh" ${tz} - zic -L /dev/null -d $ZONEINFO/posix -y "sh yearistype.sh" ${tz} + zic -L /dev/null -d $ZONEINFO -y "sh yearistype.sh" ${tz} + zic -L /dev/null -d $ZONEINFO/posix -y "sh yearistype.sh" ${tz} zic -L leapseconds -d $ZONEINFO/right -y "sh yearistype.sh" ${tz} done @@ -385,7 +385,7 @@ unset ZONEINFO</userinput></screen> EOF</userinput></screen> <para>If desired, the dynamic loader can also search a directory and - include the contents of files found there. Generally the files in + include the contents of files found there. Generally the files in this include directory are one line specifying the desired library path. To add this capability run the following commands:</para> diff --git a/chapter06/grub.xml b/chapter06/grub.xml index 5be1d7f74..6354a4777 100644 --- a/chapter06/grub.xml +++ b/chapter06/grub.xml @@ -67,7 +67,7 @@ <screen><userinput remap="install">make install</userinput></screen> - <para>Using GRUB to make your LFS system bootable will be discussed in + <para>Using GRUB to make your LFS system bootable will be discussed in <xref linkend="ch-bootable-grub"/>.</para> </sect2> @@ -80,7 +80,7 @@ <segtitle>Installed directories</segtitle> <seglistitem> - + <seg> grub-bios-setup, grub-editenv, grub-fstest, grub-install, grub-kbdcomp, grub-menulst2cfg, grub-mkconfig, grub-mkimage, grub-mklayout, grub-mknetdir, diff --git a/chapter06/iproute2.xml b/chapter06/iproute2.xml index b367d20ef..b912ca4db 100644 --- a/chapter06/iproute2.xml +++ b/chapter06/iproute2.xml @@ -142,9 +142,9 @@ sed -i 's/arpd.8//' man/man8/Makefile</userinput></screen> <varlistentry id="ifcfg"> <term><command>ifcfg</command></term> <listitem> - <para>A shell script wrapper for the <command>ip</command> command. - Note that it requires the <command>arping</command> and - <command>rdisk</command> programs from the + <para>A shell script wrapper for the <command>ip</command> command. + Note that it requires the <command>arping</command> and + <command>rdisk</command> programs from the iputils package found at <ulink url="http://www.skbuff.net/iputils/"/>.</para> <indexterm zone="ch-system-iproute2 ifcfg"> <primary sortas="b-ifcfg">ifcfg</primary> diff --git a/chapter06/kbd.xml b/chapter06/kbd.xml index ea4fdffc5..97adb6899 100644 --- a/chapter06/kbd.xml +++ b/chapter06/kbd.xml @@ -124,7 +124,7 @@ cp -R -v doc/* \ <segtitle>Installed directory</segtitle> <seglistitem> - <seg>chvt, deallocvt, dumpkeys, fgconsole, getkeycodes, kbdinfo, + <seg>chvt, deallocvt, dumpkeys, fgconsole, getkeycodes, kbdinfo, kbd_mode, kbdrate, loadkeys, loadunimap, mapscrn, openvt, psfaddtable (link to psfxtable), psfgettable (link to psfxtable), psfstriptable (link to psfxtable), psfxtable, <!--resizecons,--> diff --git a/chapter06/kernfs.xml b/chapter06/kernfs.xml index 51bcbe59c..b46f72437 100644 --- a/chapter06/kernfs.xml +++ b/chapter06/kernfs.xml @@ -72,7 +72,7 @@ mknod -m 666 $LFS/dev/null c 1 3</userinput></screen> mount -vt proc proc $LFS/proc mount -vt sysfs sysfs $LFS/sys</userinput></screen> - <para>In some host systems, <filename>/dev/shm</filename> is a + <para>In some host systems, <filename>/dev/shm</filename> is a symbolic link to <filename class="directory">/run/shm</filename>. Inside a chroot environment, this temporary file system needs to be mounted separate from the host file system:</para> diff --git a/chapter06/linux-headers.xml b/chapter06/linux-headers.xml index ea1959794..9e424516a 100644 --- a/chapter06/linux-headers.xml +++ b/chapter06/linux-headers.xml @@ -54,7 +54,7 @@ <para>Now test and extract the user-visible kernel headers from the source. They are placed in an intermediate local directory and copied to the needed - location because the extraction process removes any existing files in + location because the extraction process removes any existing files in the target directory. There are also some hidden files used by the kernel developers and not needed by LFS that are removed from the intermediate directory.</para> @@ -97,7 +97,7 @@ find dest/include \( -name .install -o -name ..install.cmd \) -delete <primary sortas="e-/usr/include/asm/*.h">/usr/include/asm/*.h</primary> </indexterm> </listitem> - </varlistentry> + </varlistentry> <varlistentry id="asm-generic"> <term><filename class="headerfile">/usr/include/asm-generic/*.h</filename></term> @@ -107,7 +107,7 @@ find dest/include \( -name .install -o -name ..install.cmd \) -delete <primary sortas="e-/usr/include/asm-generic/*.h">/usr/include/asm-generic/*.h</primary> </indexterm> </listitem> - </varlistentry> + </varlistentry> <varlistentry id="drm"> <term><filename class="headerfile">/usr/include/drm/*.h</filename></term> @@ -117,7 +117,7 @@ find dest/include \( -name .install -o -name ..install.cmd \) -delete <primary sortas="e-/usr/include/drm/*.h">/usr/include/drm/*.h</primary> </indexterm> </listitem> - </varlistentry> + </varlistentry> <varlistentry id="linux"> <term><filename class="headerfile">/usr/include/linux/*.h</filename></term> @@ -127,7 +127,7 @@ find dest/include \( -name .install -o -name ..install.cmd \) -delete <primary sortas="e-/usr/include/linux/*.h">/usr/include/linux/*.h</primary> </indexterm> </listitem> - </varlistentry> + </varlistentry> <varlistentry id="mtd"> <term><filename class="headerfile">/usr/include/mtd/*.h</filename></term> @@ -137,7 +137,7 @@ find dest/include \( -name .install -o -name ..install.cmd \) -delete <primary sortas="e-/usr/include/mtd/*.h">/usr/include/mtd/*.h</primary> </indexterm> </listitem> - </varlistentry> + </varlistentry> <varlistentry id="rdma"> <term><filename class="headerfile">/usr/include/rdma/*.h</filename></term> @@ -147,7 +147,7 @@ find dest/include \( -name .install -o -name ..install.cmd \) -delete <primary sortas="e-/usr/include/rdma/*.h">/usr/include/rdma/*.h</primary> </indexterm> </listitem> - </varlistentry> + </varlistentry> <varlistentry id="scsi"> <term><filename class="headerfile">/usr/include/scsi/*.h</filename></term> @@ -157,7 +157,7 @@ find dest/include \( -name .install -o -name ..install.cmd \) -delete <primary sortas="e-/usr/include/scsi/*.h">/usr/include/scsi/*.h</primary> </indexterm> </listitem> - </varlistentry> + </varlistentry> <varlistentry id="sound"> <term><filename class="headerfile">/usr/include/sound/*.h</filename></term> @@ -167,7 +167,7 @@ find dest/include \( -name .install -o -name ..install.cmd \) -delete <primary sortas="e-/usr/include/sound/*.h">/usr/include/sound/*.h</primary> </indexterm> </listitem> - </varlistentry> + </varlistentry> <varlistentry id="video"> <term><filename class="headerfile">/usr/include/video/*.h</filename></term> @@ -177,7 +177,7 @@ find dest/include \( -name .install -o -name ..install.cmd \) -delete <primary sortas="e-/usr/include/video/*.h">/usr/include/video/*.h</primary> </indexterm> </listitem> - </varlistentry> + </varlistentry> <varlistentry id="xen"> <term><filename class="headerfile">/usr/include/xen/*.h</filename></term> @@ -187,7 +187,7 @@ find dest/include \( -name .install -o -name ..install.cmd \) -delete <primary sortas="e-/usr/include/xen/*.h">/usr/include/xen/*.h</primary> </indexterm> </listitem> - </varlistentry> + </varlistentry> </variablelist> diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml index ab9ba7dd3..6f9cc3792 100644 --- a/chapter06/ncurses.xml +++ b/chapter06/ncurses.xml @@ -116,8 +116,8 @@ non-wide-character Ncurses libraries. Trick such applications into linking with wide-character libraries by means of symlinks and linker scripts:</para> -<screen><userinput remap="install">for lib in ncurses form panel menu ; do - rm -vf /usr/lib/lib${lib}.so +<screen><userinput remap="install">for lib in ncurses form panel menu ; do + rm -vf /usr/lib/lib${lib}.so echo "INPUT(-l${lib}w)" > /usr/lib/lib${lib}.so ln -sfv lib${lib}w.a /usr/lib/lib${lib}.a ln -sfv ${lib}w.pc /usr/lib/pkgconfig/${lib}.pc @@ -144,7 +144,7 @@ cp -v -R doc/* /usr/share/doc/ncurses-&ncurses-version;</userinput></screen> <para>The instructions above don't create non-wide-character Ncurses libraries since no package installed by compiling from sources would link against them at runtime. If you must have such libraries because - of some binary-only application or to be compliant with LSB, build + of some binary-only application or to be compliant with LSB, build the package again with the following commands:</para> <screen role="nodump"><userinput>make distclean diff --git a/chapter06/perl.xml b/chapter06/perl.xml index 4fb45bd1a..24f99adf0 100644 --- a/chapter06/perl.xml +++ b/chapter06/perl.xml @@ -222,7 +222,7 @@ <varlistentry id="cpanp-run-perl"> <term><command>cpanp-run-perl</command></term> <listitem> - <para>Perl script that is used to enable flushing of the output + <para>Perl script that is used to enable flushing of the output buffer after each write in spawned processes</para> <indexterm zone="ch-system-perl cpanp-run-perl"> <primary sortas="b-cpanp-run-perl">cpanp-run-perl</primary> diff --git a/chapter06/pkgconfig.xml b/chapter06/pkgconfig.xml index d9493e1b8..4b35c67bb 100644 --- a/chapter06/pkgconfig.xml +++ b/chapter06/pkgconfig.xml @@ -55,7 +55,7 @@ <varlistentry> <term><parameter>--with-internal-glib</parameter></term> <listitem> - <para>This will allow pkg-config to use it's internal version of + <para>This will allow pkg-config to use it's internal version of glib because an external version is not available in LFS.</para> </listitem> </varlistentry> diff --git a/chapter06/pkgmgt.xml b/chapter06/pkgmgt.xml index 8b563ec33..67ffd1cd7 100644 --- a/chapter06/pkgmgt.xml +++ b/chapter06/pkgmgt.xml @@ -227,7 +227,7 @@ make DESTDIR=/usr/pkg/libfoo/1.1 install</userinput></screen> <para>Creation of package files that include dependency information is complex and is beyond the scope of LFS.</para> - <para>Slackware uses a <command>tar</command> based system for package + <para>Slackware uses a <command>tar</command> based system for package archives. This system purposely does not handle package dependencies as more complex package managers do. For details of Slackware package management, see <ulink @@ -259,7 +259,7 @@ make DESTDIR=/usr/pkg/libfoo/1.1 install</userinput></screen> the root directory (about 250MB uncompressed for a base LFS build), copying that file via network transfer or CD-ROM to the new system and expanding it. From that point, a few configuration files will have to be changed. - Configuration files that may need to be updated include: + Configuration files that may need to be updated include: <filename>/etc/hosts</filename>, <filename>/etc/fstab</filename>, <filename>/etc/passwd</filename>, @@ -268,7 +268,7 @@ make DESTDIR=/usr/pkg/libfoo/1.1 install</userinput></screen> <filename>/etc/ld.so.conf</filename>, <filename>/etc/sysconfig/rc.site</filename>, <filename>/etc/sysconfig/network</filename>, and - <filename>/etc/sysconfig/ifconfig.eth0</filename>. + <filename>/etc/sysconfig/ifconfig.eth0</filename>. </para> <para>A custom kernel may need to be built for the new system depending on diff --git a/chapter06/popt.xml b/chapter06/popt.xml index 1423f12d5..e1f950808 100644 --- a/chapter06/popt.xml +++ b/chapter06/popt.xml @@ -23,7 +23,7 @@ <sect2 role="package"> <title/> - <para>The Popt package contains a library used by some programs + <para>The Popt package contains a library used by some programs to parse command-line options.</para> <segmentedlist> diff --git a/chapter06/procps.xml b/chapter06/procps.xml index 8da11e5c0..1b59d83af 100644 --- a/chapter06/procps.xml +++ b/chapter06/procps.xml @@ -57,7 +57,7 @@ <term><parameter>--disable-skill</parameter></term> <listitem> <para>This switch disables the obsolete and unportable - skill and snice commands.</para> + skill and snice commands.</para> </listitem> </varlistentry> <varlistentry> @@ -68,23 +68,23 @@ </listitem> </varlistentry> </variablelist> - + <para>Compile the package:</para> <screen><userinput remap="make">make</userinput></screen> - <para>The test suite needs some custom modifications for LFS. + <para>The test suite needs some custom modifications for LFS. The <command>which</command> is not available and the - <command>pmap</command> test does not match a newline character in + <command>pmap</command> test does not match a newline character in two tests. To run the test suite, run the following commands:</para> <screen><userinput remap="test">pushd testsuite sed -i 's|exec which sleep|exec echo /tools/bin/sleep|' config/unix.exp sed -i 's|pmap_initname\\\$|pmap_initname|' pmap.test/pmap.exp - make site.exp + make site.exp DEJAGNU=global-conf.exp runtest popd</userinput></screen> - + <para>Install the package:</para> <screen><userinput remap="install">make install</userinput></screen> @@ -92,7 +92,7 @@ popd</userinput></screen> <para>Finally move the library to a location that can be found if <filename class="directory">/usr</filename> is not mounted.</para> -<screen><userinput remap="install">mv -v /usr/lib/libprocps.so.* /lib +<screen><userinput remap="install">mv -v /usr/lib/libprocps.so.* /lib ln -sfv ../../lib/libprocps.so.1.1.0 /usr/lib/libprocps.so</userinput></screen> </sect2> @@ -105,7 +105,7 @@ ln -sfv ../../lib/libprocps.so.1.1.0 /usr/lib/libprocps.so</userinput></screen> <segtitle>Installed library</segtitle> <seglistitem> - <seg>free, pgrep, pkill, pmap, ps, pwdx, slabtop, + <seg>free, pgrep, pkill, pmap, ps, pwdx, slabtop, sysctl, tload, top, uptime, vmstat, w, and, watch</seg> <seg>libprocps.so</seg> </seglistitem> diff --git a/chapter06/psmisc.xml b/chapter06/psmisc.xml index 4a2770489..19d31cec1 100644 --- a/chapter06/psmisc.xml +++ b/chapter06/psmisc.xml @@ -55,7 +55,7 @@ <screen><userinput remap="install">make install</userinput></screen> - <para>Finally, move the <command>killall</command> and <command>fuser</command> + <para>Finally, move the <command>killall</command> and <command>fuser</command> programs to the location specified by the FHS:</para> <screen><userinput remap="install">mv -v /usr/bin/fuser /bin diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml index de5d3b968..a312bd05c 100644 --- a/chapter06/systemd.xml +++ b/chapter06/systemd.xml @@ -25,7 +25,7 @@ <para>The Udev package contains programs for dynamic creation of device nodes. The development of udev has been merged with systemd, but - most of systemd is incompatible with LFS. Here we build and install just + most of systemd is incompatible with LFS. Here we build and install just the needed udev files.</para> <segmentedlist> @@ -44,8 +44,8 @@ <note><para>This package is a little different from other packages. The initial package that is extracted is - <filename>systemd-&systemd-version;.tar.xz</filename> even though the - application we are installing is udev. After changing to the + <filename>systemd-&systemd-version;.tar.xz</filename> even though the + application we are installing is udev. After changing to the systemd directory, follow the instructions below.</para></note> <para>The udev-lfs tarball contains LFS-specific files used to build @@ -93,9 +93,9 @@ <seglistitem> <seg>accelerometer, ata_id, cdrom_id, collect, mtd_probe, scsi_id, v4l_id, udevadm, and udevd</seg> - + <seg>libudev.so</seg> - + <seg>/etc/udev, /lib/udev, /lib/firmware, /usr/share/doc/udev</seg> </seglistitem> </segmentedlist> diff --git a/chapter06/sysvinit.xml b/chapter06/sysvinit.xml index b1b85c6b9..e93e1cc85 100644 --- a/chapter06/sysvinit.xml +++ b/chapter06/sysvinit.xml @@ -60,7 +60,7 @@ versions of these programs and their man pages:</para> <screen><userinput remap="make">sed -i -e '/utmpdump/d' \ - -e '/mountpoint/d' src/Makefile</userinput></screen> + -e '/mountpoint/d' src/Makefile</userinput></screen> <para>Compile the package:</para> @@ -81,7 +81,7 @@ <segtitle>Installed programs</segtitle> <seglistitem> - <seg>bootlogd, fstab-decode, halt, init, killall5, last, + <seg>bootlogd, fstab-decode, halt, init, killall5, last, lastb (link to last), mesg, pidof (link to killall5), poweroff (link to halt), reboot (link to halt), runlevel, shutdown, sulogin, and telinit (link to init)</seg> diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml index 476aa2ed5..b61bdfa06 100644 --- a/chapter06/util-linux.xml +++ b/chapter06/util-linux.xml @@ -112,7 +112,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen> wdctl, whereis, wipefs, and x86_64</seg> <seg>libblkid.{a,so}, libmount.{a,so}, libuuid.{a,so}</seg> - + <seg>/usr/include/blkid, /usr/include/libmount, /usr/include/uuid, /usr/share/getopt, /var/lib/hwclock</seg> </seglistitem> @@ -343,7 +343,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen> <varlistentry id="findmnt"> <term><command>findmnt</command></term> <listitem> - <para>Is a command line interface to the libmount library + <para>Is a command line interface to the libmount library for work with mountinfo, fstab and mtab files</para> <indexterm zone="ch-system-util-linux findmnt"> <primary sortas="b-findmnt">findmnt</primary> @@ -397,7 +397,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen> <varlistentry id="fsfreeze"> <term><command>fsfreeze</command></term> <listitem> - <para>Is a very simple wrapper around FIFREEZE/FITHAW ioctl + <para>Is a very simple wrapper around FIFREEZE/FITHAW ioctl kernel driver operations</para> <indexterm zone="ch-system-util-linux fsfreeze"> <primary sortas="b-fsfreeze">fsfreeze</primary> diff --git a/chapter07/bootscripts.xml b/chapter07/bootscripts.xml index 2ad26e814..5c7d71cbd 100644 --- a/chapter07/bootscripts.xml +++ b/chapter07/bootscripts.xml @@ -58,7 +58,7 @@ ifup, localnet, modules, mountfs, mountkernfs, network, rc, reboot, sendsignals, setclock, static, swap, sysctl, sysklogd, template, udev, and udev_retry</seg> - <seg>/etc/rc.d, /etc/init.d (symbolic link), /etc/sysconfig, + <seg>/etc/rc.d, /etc/init.d (symbolic link), /etc/sysconfig, /lib/services, /lib/lsb (symbolic link)</seg> </seglistitem> </segmentedlist> diff --git a/chapter07/console.xml b/chapter07/console.xml index 75a3d2a25..d37dab6df 100644 --- a/chapter07/console.xml +++ b/chapter07/console.xml @@ -19,7 +19,7 @@ bootscript that sets up the keyboard map, console font and console kernel log level. If non-ASCII characters (e.g., the copyright sign, the British pound sign and Euro symbol) will not be used and the keyboard is a U.S. one, much - of this section can be skipped. Without the configuration file, (or + of this section can be skipped. Without the configuration file, (or equivalent settings in <filename>rc.site</filename>), the <command>console</command> bootscript will do nothing.</para> @@ -78,7 +78,7 @@ name, <quote>-m</quote>, and the name of the application character map to load. E.g., in order to load the <quote>lat1-16</quote> font together with the <quote>8859-1</quote> application character map - (as it is appropriate in the USA), + (as it is appropriate in the USA), <!-- because of the copyright sign --> set this variable to <quote>lat1-16 -m 8859-1</quote>. In UTF-8 mode, the kernel uses the application character map for diff --git a/chapter07/introduction.xml b/chapter07/introduction.xml index b8afde239..4b0994978 100644 --- a/chapter07/introduction.xml +++ b/chapter07/introduction.xml @@ -10,10 +10,10 @@ <title>Introduction</title> - <para>This chapter discusses configuration files and boot scripts. - First, the general configuration files needed to set up networking are + <para>This chapter discusses configuration files and boot scripts. + First, the general configuration files needed to set up networking are presented.</para> - + <itemizedlist> <listitem> <para><xref linkend="ch-scripts-network" role="."/></para> @@ -22,7 +22,7 @@ <para><xref linkend="ch-scripts-hosts" role="."/></para> </listitem> </itemizedlist> - + <para>Second, issues that affect the proper setup of devices diescussed.</para> <itemizedlist> @@ -38,14 +38,14 @@ scripts needed during the boot process. Most of these scripts will work without modification, but a few require additional configuration files because they deal with hardware-dependent information.</para> - + <para>System-V style init scripts are employed in this book because they are widely used and relatively simple. For additional options, a hint detailing the BSD style init setup is available at <ulink url="&hints-root;bsd-init.txt"/>. Searching the LFS mailing lists for <quote>depinit</quote>, <quote>upstart</quote>, or <quote>systemd</quote> will also offer additional information.</para> - + <para>If using an alternative style of init scripts, skip these sections.</para> <para>A listing of the boot scripts are found in <xref linkend="scripts" @@ -72,8 +72,8 @@ <para><xref linkend="ch-scripts-sysklogd" role="."/></para> </listitem> </itemizedlist> - - + + <para>Finally, there is a brief introduction to the scripts and configuration files used when the user logs into the system.</para> diff --git a/chapter07/network.xml b/chapter07/network.xml index cd1e9ec3c..8a721fb5a 100644 --- a/chapter07/network.xml +++ b/chapter07/network.xml @@ -30,7 +30,7 @@ <para>If there is only one network interface in the system to be configured, this section is optional, although it will never be wrong to do it. In many cases (e.g. a laptop with a wireless and a wired interface), - accomplishing the configuration in this section is necessary.</para> + accomplishing the configuration in this section is necessary.</para> <para>With Udev and modular network drivers, the network interface numbering is not persistent across reboots by default, because the drivers are loaded @@ -51,7 +51,7 @@ <note><para>In some cases such as when MAC addresess have been assigned to a network card manually or in a virtual environment such as Xen, - the network rules file may not have been generated because addresses + the network rules file may not have been generated because addresses are not consistently assigned. In these cases, just continue to the next section.</para></note> @@ -125,7 +125,7 @@ <filename>ifconfig.xyz</filename>, where <quote>xyz</quote> is meaningful to the administrator such as the device name (e.g. eth0). Inside this file are attributes to this interface, such as its IP - address(es), subnet masks, and so forth. It is necessary that + address(es), subnet masks, and so forth. It is necessary that the stem of the filename be <emphasis>ifconfig</emphasis>.</para> <para>The following command creates a sample file for the @@ -153,7 +153,7 @@ EOF</userinput></screen> <command>ifup</command> and <command>ifdown</command> commands.</para> <para>The <envar>IFACE</envar> variable defines the interface name, - for example, eth0. It is required for all network device configuration + for example, eth0. It is required for all network device configuration files. </para> <para>The <envar>SERVICE</envar> variable defines the method used for diff --git a/chapter07/profile.xml b/chapter07/profile.xml index 09f59eded..af33993f3 100644 --- a/chapter07/profile.xml +++ b/chapter07/profile.xml @@ -155,7 +155,7 @@ EOF</userinput></screen> 8-bit</quote>). So you can use the <quote>C</quote> locale only if you are sure that you will never need 8-bit characters.</para> - <para>UTF-8 based locales are not supported well by many programs. + <para>UTF-8 based locales are not supported well by many programs. Work is in progress to document and, if possible, fix such problems, see <ulink url="&blfs-root;view/svn/introduction/locale-issues.html"/>.</para> diff --git a/chapter07/setclock.xml b/chapter07/setclock.xml index f8a03579b..1daa445ef 100644 --- a/chapter07/setclock.xml +++ b/chapter07/setclock.xml @@ -51,7 +51,7 @@ UTC=1 -# Set this to any options you might need to give to hwclock, +# Set this to any options you might need to give to hwclock, # such as machine hardware clock type for Alphas. CLOCKPARAMS= diff --git a/chapter07/site.xml b/chapter07/site.xml index dcb2c5532..8e0e4bd76 100644 --- a/chapter07/site.xml +++ b/chapter07/site.xml @@ -24,7 +24,7 @@ <filename>rc.site</filename>, the values in the script specific files have precedence. </para> - <para><filename>rc.site</filename> also contains parameters that can + <para><filename>rc.site</filename> also contains parameters that can customize other aspects of the boot process. Setting the IPROMPT variable will enable selective running of bootscripts. Other options are described in the file comments. The default version of the file is as follows:</para> @@ -70,11 +70,11 @@ <command>/sbin/shutdown -f -r now</command>. On the other hand, you can force all file systems to be checked by creating <filename>/forcefsck</filename> or running <command>shutdown</command> with - the <parameter>-F</parameter> parameter instead of <parameter>-f</parameter>. + the <parameter>-F</parameter> parameter instead of <parameter>-f</parameter>. </para> - + <para>Setting the variable FASTBOOT=y will disable <command>fsck</command> - during the boot process until it is removed. This is not recommended + during the boot process until it is removed. This is not recommended on a permanent basis.</para></listitem> <listitem><para>Normally, all files in the <filename diff --git a/chapter07/udev.xml b/chapter07/udev.xml index b8a8bc8cb..3a287e8f1 100644 --- a/chapter07/udev.xml +++ b/chapter07/udev.xml @@ -88,7 +88,7 @@ data which the drivers register with <systemitem class="filesystem">sysfs</systemitem> are available to userspace processes and to udevd for processing (including modifications to device - nodes).</para> + nodes).</para> </sect3> @@ -133,7 +133,7 @@ Creating static device nodes in <filename class="directory">/lib/udev/devices</filename> also provides an easy workaround for devices that are not supported by the dynamic device - handling infrastructure.</para> + handling infrastructure.</para> <para>The <filename>/etc/rc.d/init.d/udev</filename> initscript starts <command>udevd</command>, triggers any "coldplug" devices that have @@ -142,7 +142,7 @@ <filename>/sbin/hotplug </filename>. This is done because the kernel no longer needs to call out to an external binary. Instead <command>udevd</command> will listen on a netlink socket for uevents that - the kernel raises.</para> + the kernel raises.</para> <para>The <command>/etc/rc.d/init.d/udev_retry</command> initscript takes care of re-triggering events for subsystems whose rules may rely on diff --git a/chapter07/usage.xml b/chapter07/usage.xml index 73daf2861..78c1268bb 100644 --- a/chapter07/usage.xml +++ b/chapter07/usage.xml @@ -50,7 +50,7 @@ </indexterm> <para>During the kernel initialization, the first program that is run - is either specified on the command line or, by default + is either specified on the command line or, by default <command>init</command>. This program reads the initialization file <filename>/etc/inittab</filename>. Create this file with:</para> diff --git a/chapter08/fstab.xml b/chapter08/fstab.xml index 39873d650..066c3b901 100644 --- a/chapter08/fstab.xml +++ b/chapter08/fstab.xml @@ -103,7 +103,7 @@ EOF</userinput></screen> failures for some hard disk types. To do this, add the <option>barrier=1</option> mount option to the appropriate entry in <filename>/etc/fstab</filename>. To check if the disk drive supports - this option, run + this option, run <ulink url="http://www.linuxfromscratch.org/blfs/view/cvs/general/hdparm.html">hdparm</ulink> on the applicable disk drive. For example, if:</para> diff --git a/chapter08/grub.xml b/chapter08/grub.xml index 8d92d5ea7..1ff73d777 100644 --- a/chapter08/grub.xml +++ b/chapter08/grub.xml @@ -47,8 +47,8 @@ xorriso -as cdrecord -v dev=/dev/cdrw blank=as_needed grub-img.iso</userinput></ the form of <emphasis>(hdn,m)</emphasis>, where <emphasis>n</emphasis> is the hard drive number and <emphasis>m</emphasis> is the partition number. The hard drive number starts from zero, but the partition number - starts from one for normal partitions and five for extended partitions. - Note that this is different from earlier versions where + starts from one for normal partitions and five for extended partitions. + Note that this is different from earlier versions where both numbers started from zero. For example, partition <filename class="partition">sda1</filename> is <emphasis>(hd0,1)</emphasis> to GRUB and <filename class="partition">sdb3</filename> is @@ -63,7 +63,7 @@ xorriso -as cdrecord -v dev=/dev/cdrw blank=as_needed grub-img.iso</userinput></ <sect2> <title>Setting Up the Configuration</title> - <para>GRUB works by writing data to the first physical track of the + <para>GRUB works by writing data to the first physical track of the hard disk. This area is not part of any file system. The programs there access GRUB modules in the boot partition. The default location is /boot/grub/.</para> @@ -90,19 +90,19 @@ xorriso -as cdrecord -v dev=/dev/cdrw blank=as_needed grub-img.iso</userinput></ class="partition">sda2</filename>.</para> <para>Install the GRUB files into <filename - class="directory">/boot/grub</filename> and set up the boot track:</para> + class="directory">/boot/grub</filename> and set up the boot track:</para> <warning> <para>The following command will overwrite the current boot loader. Do not run the command if this is not desired, for example, if using a third party - boot manager to manage the Master Boot Record (MBR).</para> + boot manager to manage the Master Boot Record (MBR).</para> </warning> <screen role="nodump"><userinput>grub-install /dev/sda</userinput></screen> <!-- This does not seem to be true any more - <note><para><application>grub-install</application> is a script and calls another - program, grub-probe, that may fail with a message "cannot stat `/dev/root'". + <note><para><application>grub-install</application> is a script and calls another + program, grub-probe, that may fail with a message "cannot stat `/dev/root'". If so, create a temporary symbolic link from your root partition to /dev/root:</para> <screen role="nodump"><userinput>ln -sv /dev/sda2 /dev/root</userinput></screen> @@ -136,20 +136,20 @@ EOF</userinput></screen> used a separate /boot partition, remove /boot from the above <emphasis>linux</emphasis> line. You will also need to change the <emphasis>set root</emphasis> line to point to the boot partition. - </para></note> + </para></note> <para>GRUB is an extremely powerful program and it provides a tremendous number of options for booting from a wide variety of devices, operating - systems, and partition types. There are also many options for customization + systems, and partition types. There are also many options for customization such as graphical splash screens, playing sounds, mouse input, etc. The details of these options are beyond the scope of this introduction.</para> <caution><para>There is a command, <application>grub-mkconfig</application>, that can write a configuration file automatically. It uses a set of scripts in /etc/grub.d/ and will destroy any customizations that you make. These scripts - are designed primarily for non-source distributions and are not recommended for - LFS. If you install a commercial Linux distribution, there is a good chance - that this program will be run. Be sure to back up your grub.cfg file.</para></caution> + are designed primarily for non-source distributions and are not recommended for + LFS. If you install a commercial Linux distribution, there is a good chance + that this program will be run. Be sure to back up your grub.cfg file.</para></caution> </sect2> diff --git a/chapter08/kernel.xml b/chapter08/kernel.xml index fbca889fb..7eed8d290 100644 --- a/chapter08/kernel.xml +++ b/chapter08/kernel.xml @@ -65,7 +65,7 @@ <note><para>Due to recent changes in <application>udev</application>, be sure to select:</para> - + <screen role="nodump">Device Drivers ---> Generic Driver Options ---> Maintain a devtmpfs filesystem to mount at /dev</screen></note> @@ -134,7 +134,7 @@ <para><filename>System.map</filename> is a symbol file for the kernel. It maps the function entry points of every function in the kernel API, as well as the addresses of the kernel data structures for the running - kernel. It is used as a resource when investigating kernel problems. + kernel. It is used as a resource when investigating kernel problems. Issue the following command to install the map file:</para> <screen><userinput remap="install">cp -v System.map /boot/System.map-&linux-version;</userinput></screen> @@ -228,7 +228,7 @@ EOF</userinput></screen> <segtitle>Installed directories</segtitle> <seglistitem> - <seg>config-&linux-version;, + <seg>config-&linux-version;, vmlinux-&linux-version;-lfs-&version;-&linux-version;, and System.map-&linux-version;</seg> <seg>/lib/modules, /usr/share/doc/linux-&linux-version;</seg> diff --git a/chapter09/reboot.xml b/chapter09/reboot.xml index 7700b2e93..d8d4aa00d 100644 --- a/chapter09/reboot.xml +++ b/chapter09/reboot.xml @@ -17,7 +17,7 @@ a few extra packages from the BLFS book while still in our current chroot environment, you can leave yourself in a much better position to continue on once you reboot into your new LFS installation. Here are some suggestions:</para> - + <itemizedlist> <listitem><para>A text mode browser such as <ulink @@ -49,7 +49,7 @@ url='&blfs-root;/view/svn/postlfs/openssl.html'>openssl</ulink>. </para></listitem> - <listitem><para>To make fetching files over the internet easier, install + <listitem><para>To make fetching files over the internet easier, install <ulink url='&blfs-root;/view/svn/basicnet/wget.html'>wget</ulink>. </para></listitem> @@ -59,7 +59,7 @@ url='&blfs-root;/view/svn/postlfs/parted.html'>parted</ulink> will be useful. </para></listitem> - <listitem><para>Finally, a review of the following configuration files + <listitem><para>Finally, a review of the following configuration files is also appropriate at this point. </para> <itemizedlist> @@ -88,13 +88,13 @@ <screen><userinput>umount -v $LFS/dev/pts -if [ -h $LFS/dev/shm ]; then +if [ -h $LFS/dev/shm ]; then link=$(readlink $LFS/dev/shm) umount -v $LFS/$link unset link else umount -v $LFS/dev/shm -fi +fi umount -v $LFS/dev umount -v $LFS/proc diff --git a/chapter09/theend.xml b/chapter09/theend.xml index 230784c1a..ed6a7e59b 100644 --- a/chapter09/theend.xml +++ b/chapter09/theend.xml @@ -34,7 +34,7 @@ DISTRIB_RELEASE="&version;" DISTRIB_CODENAME="<your name here>" DISTRIB_DESCRIPTION="Linux From Scratch" EOF</userinput></screen> - + <para>Be sure to put some sort of customization for the field 'DISTRIB_CODENAME' to make the system uniquely yours.</para> diff --git a/general.ent b/general.ent index ffcf585b4..030103d4a 100644 --- a/general.ent +++ b/general.ent @@ -1,5 +1,5 @@ -<!ENTITY version "SVN-20130130"> -<!ENTITY releasedate "January 30, 2013"> +<!ENTITY version "SVN-20130211"> +<!ENTITY releasedate "February 11, 2013"> <!ENTITY copyrightdate "1999-2013"><!-- jhalfs needs a literal dash, not – --> <!ENTITY milestone "7.3"> <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" --> diff --git a/prologue/architecture.xml b/prologue/architecture.xml index 7ee2d8d0f..45e1fbdb1 100644 --- a/prologue/architecture.xml +++ b/prologue/architecture.xml @@ -25,8 +25,8 @@ larger and the execution speeds are only slightly faster. For example, in a test build of LFS-6.5 on a Core2Duo CPU based system, the following statistics were measured:</para> -<screen><computeroutput>Architecture Build Time Build Size -32-bit 198.5 minutes 648 MB +<screen><computeroutput>Architecture Build Time Build Size +32-bit 198.5 minutes 648 MB 64-bit 190.6 minutes 709 MB</computeroutput></screen> <para>As you can see, the 64-bit build is only 4% faster and is 9% larger than diff --git a/prologue/bookinfo.xml b/prologue/bookinfo.xml index 8ca2a5c91..5d95c53c5 100644 --- a/prologue/bookinfo.xml +++ b/prologue/bookinfo.xml @@ -33,7 +33,7 @@ <para>All rights reserved.</para> <para>This book is licensed under a <xref linkend="CC"/>.</para> - <para>Computer instructions may be extracted from the book under the + <para>Computer instructions may be extracted from the book under the <xref linkend="MIT"/>.</para> <para><trademark class='registered'>Linux</trademark> is a registered trademark of diff --git a/prologue/foreword.xml b/prologue/foreword.xml index da1de7756..6a4c56828 100644 --- a/prologue/foreword.xml +++ b/prologue/foreword.xml @@ -13,7 +13,7 @@ <para>My journey to learn and better understand Linux began over a decade ago, back in 1998. I had just installed my first Linux distribution and had quickly become intrigued with the whole concept and philosophy behind -Linux.</para> +Linux.</para> <para>There are always many ways to accomplish a single task. The same can be said about Linux distributions. A great many have existed over the years. Some diff --git a/prologue/hostreqs.xml b/prologue/hostreqs.xml index d44550f41..74cb9e573 100644 --- a/prologue/hostreqs.xml +++ b/prologue/hostreqs.xml @@ -157,7 +157,7 @@ echo "/bin/sh -> `readlink -f /bin/sh`" echo -n "Binutils: "; ld --version | head -n1 | cut -d" " -f3- bison --version | head -n1 if [ -e /usr/bin/yacc ]; - then echo "/usr/bin/yacc -> `readlink -f /usr/bin/yacc`"; + then echo "/usr/bin/yacc -> `readlink -f /usr/bin/yacc`"; else echo "yacc not found"; fi bzip2 --version 2>&1 < /dev/null | head -n1 | cut -d" " -f1,6- @@ -166,7 +166,7 @@ diff --version | head -n1 find --version | head -n1 gawk --version | head -n1 if [ -e /usr/bin/awk ]; - then echo "/usr/bin/awk -> `readlink -f /usr/bin/awk`"; + then echo "/usr/bin/awk -> `readlink -f /usr/bin/awk`"; else echo "awk not found"; fi gcc --version | head -n1 @@ -184,7 +184,7 @@ echo "Texinfo: `makeinfo --version | head -n1`" xz --version | head -n1 echo 'main(){}' > dummy.c && gcc -o dummy dummy.c -if [ -x dummy ] +if [ -x dummy ] then echo "gcc compilation OK"; else echo "gcc compilation failed"; fi rm -f dummy.c dummy</literal> diff --git a/prologue/standards.xml b/prologue/standards.xml index 20b340a99..40acd3992 100644 --- a/prologue/standards.xml +++ b/prologue/standards.xml @@ -13,21 +13,21 @@ <!--<sect2> <title/> --> - <para>The structure of LFS follows Linux standards as closely as + <para>The structure of LFS follows Linux standards as closely as possible. The primary standards are:</para> <itemizedlist> <listitem> - <para><ulink url="http://pubs.opengroup.org/onlinepubs/9699919799/"> + <para><ulink url="http://pubs.opengroup.org/onlinepubs/9699919799/"> POSIX.1-2008</ulink>.</para> </listitem> <listitem> - <para><ulink url="http://www.pathname.com/fhs/pub/fhs-2.3.html">Filesystem + <para><ulink url="http://www.pathname.com/fhs/pub/fhs-2.3.html">Filesystem Hierarchy Standard (FHS)</ulink></para> </listitem> <listitem> - <para><ulink url="http://refspecs.freestandards.org/LSB_4.0.0/">Linux + <para><ulink url="http://refspecs.freestandards.org/LSB_4.0.0/">Linux Standard Base (LSB) Core Specification 4.0</ulink></para> <para>The LSB has five separate standards: Core, C++, Desktop, @@ -48,7 +48,7 @@ <para>Creating a complete LFS system capable of passing the LSB certifications tests is possible, but not without many additional packages that are beyond the scope of LFS. These additional packages have - installation instructions in BLFS. </para> + installation instructions in BLFS. </para> <variablelist> <bridgehead renderas="sect3">Packages supplied by LFS needed to @@ -102,16 +102,16 @@ </variablelist> - <variablelist> + <variablelist> <bridgehead renderas="sect3">Packages supplied by BLFS needed to satisfy the LSB Requirements</bridgehead> <?dbfo list-presentation="list"?> - <?dbhtml list-presentation="table"?> + <?dbhtml list-presentation="table"?> <varlistentry> <term><emphasis>LSB Core:</emphasis></term> <listitem> - <para>At, Batch (a part of At), Bc, Cpio, Ed, Fcrontab, Initd-tools, + <para>At, Batch (a part of At), Bc, Cpio, Ed, Fcrontab, Initd-tools, Lsb_release, PAM, Sendmail (or Postfix or Exim) </para> </listitem> </varlistentry> @@ -155,11 +155,11 @@ </variablelist> - <variablelist> - <bridgehead renderas="sect3">Packages not supplied by LFS or BLFS + <variablelist> + <bridgehead renderas="sect3">Packages not supplied by LFS or BLFS needed to satisfy the LSB Requirements</bridgehead> <?dbfo list-presentation="list"?> - <?dbhtml list-presentation="table"?> + <?dbhtml list-presentation="table"?> <varlistentry> <term><emphasis>LSB Core:</emphasis></term> diff --git a/prologue/why.xml b/prologue/why.xml index c1aaad6ed..f70dbfba9 100644 --- a/prologue/why.xml +++ b/prologue/why.xml @@ -10,8 +10,8 @@ <title>Rationale for Packages in the Book</title> - <para>As stated earlier, the goal of LFS is to build a complete and usable - foundation-level system. This includes all packages needed to replicate + <para>As stated earlier, the goal of LFS is to build a complete and usable + foundation-level system. This includes all packages needed to replicate itself while providing a relatively minimal base from which to customize a more complete system based on the choices of the user. This does not mean that LFS is the smallest system possible. Several important packages @@ -49,7 +49,7 @@ <listitem> <para>Binutils</para> - <para>This package contains a linker, an assembler, and other + <para>This package contains a linker, an assembler, and other tools for handling object files. The programs in this package are needed to compile most of the packages in an LFS system and beyond.</para> </listitem> @@ -64,7 +64,7 @@ <listitem> <para>Bzip2</para> - <para>This package contains programs for compressing and decompressing + <para>This package contains programs for compressing and decompressing files. It is required to decompress many LFS packages.</para> </listitem> @@ -78,7 +78,7 @@ <listitem> <para>Coreutils</para> - <para>This package contains a number of essential programs for viewing + <para>This package contains a number of essential programs for viewing and manipulating files and directories. These programs are needed for command line file management, and are necessary for the installation procedures of every package in LFS.</para> @@ -94,7 +94,7 @@ <listitem> <para>Diffutils</para> - <para>This package contains programs that show the differences + <para>This package contains programs that show the differences between files or directories. These programs can be used to create patches, and are also used in many packages' build procedures.</para> </listitem> @@ -102,9 +102,9 @@ <listitem> <para>Expect</para> - <para>This package contains a program for carrying out scripted + <para>This package contains a program for carrying out scripted dialogues with other interactive programs. It is commonly used - for testing other packages. It is only installed in the temporary + for testing other packages. It is only installed in the temporary toolchain.</para> </listitem> @@ -119,7 +119,7 @@ <listitem> <para>File</para> - <para>This package contains a utility for determining the type of a + <para>This package contains a utility for determining the type of a given file or files. A few packages need it to build.</para> </listitem> @@ -133,9 +133,9 @@ <listitem> <para>Flex</para> - <para>This package contains a utility for generating programs that - recognize patterns in text. It is the GNU version of the lex - (lexical analyzer) program. It is required to build several + <para>This package contains a utility for generating programs that + recognize patterns in text. It is the GNU version of the lex + (lexical analyzer) program. It is required to build several LFS packages.</para> </listitem> @@ -150,8 +150,8 @@ <listitem> <para>Gcc</para> - <para>This package is the Gnu Compiler Collection. It contains the - C and C++ compilers as well as several others not built by LFS. + <para>This package is the Gnu Compiler Collection. It contains the + C and C++ compilers as well as several others not built by LFS. </para> </listitem> @@ -165,7 +165,7 @@ <listitem> <para>Gettext</para> - <para>This package contains utilities and libraries for + <para>This package contains utilities and libraries for internationalization and localization of numerous packages.</para> </listitem> @@ -200,7 +200,7 @@ <listitem> <para>GRUB</para> - <para>This package is the Grand Unified Boot Loader. It is one + <para>This package is the Grand Unified Boot Loader. It is one of several boot loaders available, but is the most flexible. </para> </listitem> @@ -208,7 +208,7 @@ <listitem> <para>Gzip</para> - <para>This package contains programs for compressing and + <para>This package contains programs for compressing and decompressing files. It is needed to decompress many packages in LFS and beyond.</para> </listitem> @@ -223,7 +223,7 @@ <listitem> <para>Inetutils</para> - <para>This package contains programs for basic network + <para>This package contains programs for basic network administration.</para> </listitem> @@ -260,8 +260,8 @@ <listitem> <para>Libtool</para> - <para>This package contains the GNU generic library support - script. It wraps the complexity of using shared libraries in a + <para>This package contains the GNU generic library support + script. It wraps the complexity of using shared libraries in a consistent, portable interface. It is needed by the test suites in other LFS packages.</para> </listitem> @@ -313,15 +313,15 @@ <listitem> <para>MPFR</para> - <para>This package contains functions for multiple precision + <para>This package contains functions for multiple precision arithmetic. It is required by Gcc.</para> </listitem> <listitem> <para>Ncurses</para> - <para>This package contains libraries for terminal-independent - handling of character screens. It is often used to provide + <para>This package contains libraries for terminal-independent + handling of character screens. It is often used to provide cursor control for a menuing system. It is needed by a number of packages in LFS.</para> </listitem> @@ -330,7 +330,7 @@ <para>Patch</para> <para>This package contains a program for modifying or creating files by - applying a <emphasis>patch</emphasis> file typically created + applying a <emphasis>patch</emphasis> file typically created by the <application>diff</application> program. It is needed by the build procedure for several LFS packages.</para> </listitem> @@ -355,7 +355,7 @@ <listitem> <para>Pkg-config</para> - <para>This package provides a program to return meta-data about an + <para>This package provides a program to return meta-data about an installed library or package.</para> </listitem> @@ -377,7 +377,7 @@ <listitem> <para>Psmisc</para> - <para>This package contains programs for displaying information + <para>This package contains programs for displaying information about running processes. These programs are useful for system administration.</para> </listitem> @@ -385,30 +385,30 @@ <listitem> <para>Readline</para> - <para>This package is a set of libraries that offers command-line + <para>This package is a set of libraries that offers command-line editing and history capabilities. It is used by Bash.</para> </listitem> <listitem> <para>Sed</para> - <para>This package allows editing of text without opening it in a - text editor. It is also needed by most LFS packages' configure + <para>This package allows editing of text without opening it in a + text editor. It is also needed by most LFS packages' configure scripts.</para> </listitem> <listitem> <para>Shadow</para> - <para>This package contains programs for handling passwords + <para>This package contains programs for handling passwords in a secure way.</para> </listitem> <listitem> <para>Sysklogd</para> - <para>This package contains programs for logging system messages, - such as those given by the kernel or daemon processes when unusual + <para>This package contains programs for logging system messages, + such as those given by the kernel or daemon processes when unusual events occur.</para> </listitem> @@ -431,22 +431,22 @@ <para>Tcl</para> <para>This package contains the Tool Command Language used - in many test suites in LFS packages. It is only installed in + in many test suites in LFS packages. It is only installed in the temporary toolchain.</para> </listitem> <listitem> <para>Texinfo</para> - <para>This package contains programs for reading, writing, and - converting info pages. It is used in the installation + <para>This package contains programs for reading, writing, and + converting info pages. It is used in the installation procedures of many LFS packages.</para> </listitem> <listitem> <para>Udev</para> - <para>This package contains programs for dynamic creation of + <para>This package contains programs for dynamic creation of device nodes. It is an alternative to creating thousands of static devices in the /dev directory.</para> </listitem> @@ -454,8 +454,8 @@ <listitem> <para>Util-linux</para> - <para>This package contains miscellaneous utility programs. - Among them are utilities for handling file systems, consoles, + <para>This package contains miscellaneous utility programs. + Among them are utilities for handling file systems, consoles, partitions, and messages.</para> </listitem> @@ -471,7 +471,7 @@ <listitem> <para>XZ Utils</para> - <para>This package contains programs for compressing and decompressing + <para>This package contains programs for compressing and decompressing files. It provides the highest compression generally available and is useful for decompressing packages XZ or LZMA format.</para> </listitem> @@ -479,7 +479,7 @@ <listitem> <para>Zlib</para> - <para>This package contains compression and decompression routines + <para>This package contains compression and decompression routines used by some programs.</para> </listitem> |