Author: bdubbs
Date: Wed Feb 19 14:21:37 2014
New Revision: 10489
Log:
Spelling and other general cleanup.
Use better method for installing kmod man pages.
Modified:
trunk/BOOK/chapter01/changelog.xml
trunk/BOOK/chapter05/gettext.xml
trunk/BOOK/chapter05/util-linux.xml
trunk/BOOK/chapter06/findutils.xml
trunk/BOOK/chapter06/kmod.xml
trunk/BOOK/prologue/architecture.xml
Modified: trunk/BOOK/chapter01/changelog.xml
==============================================================================
--- trunk/BOOK/chapter01/changelog.xml Wed Feb 19 03:59:48 2014 (r10488)
+++ trunk/BOOK/chapter01/changelog.xml Wed Feb 19 14:21:37 2014 (r10489)
@@ -81,7 +81,7 @@
</para>
</listitem>
<listitem>
- <para>[bdubbs] - Update automake tests to accomodate util-linux
+ <para>[bdubbs] - Update automake tests to accommodate util-linux
in /tools and to speed the test up.
</para>
</listitem>
@@ -200,7 +200,7 @@
<listitem>
<para>[bdubbs] - Add an environment variable to util-linux
in Chapter 5 to prevent an installation error for
- hosts that have unneeded capabilities availible.</para>
+ hosts that have unneeded capabilities available.</para>
</listitem>
</itemizedlist>
</listitem>
@@ -300,7 +300,7 @@
<itemizedlist>
<listitem>
<para>[bdubbs] - Update to inetutils-1.9.2 and remove
- referece to old BLFS page. Fixes
+ reference to old BLFS page. Fixes
<ulink url="&lfs-ticket-root;3471">#3471</ulink> and
<ulink url="&lfs-ticket-root;3473">#3473</ulink>.</para>
</listitem>
@@ -452,12 +452,12 @@
<itemizedlist>
<listitem>
<para>[bdubbs] - Enable building sulogin in util-linux.
- Supress installing sysvinit's sulogin.
+ Suppress installing sysvinit's sulogin.
Fixes
<ulink url="&lfs-ticket-root;3435">#3435</ulink>.</para>
</listitem>
<listitem>
- <para>[bdubbs] - Supress installing sysvinit's mesg and last
+ <para>[bdubbs] - Suppress installing sysvinit's mesg and last
that overwrite the versions installed by util-linux.
Thanks to Chris Staub. Fixes
<ulink url="&lfs-ticket-root;3434">#3434</ulink>.</para>
Modified: trunk/BOOK/chapter05/gettext.xml
==============================================================================
--- trunk/BOOK/chapter05/gettext.xml Wed Feb 19 03:59:48 2014 (r10488)
+++ trunk/BOOK/chapter05/gettext.xml Wed Feb 19 14:21:37 2014 (r10489)
@@ -44,7 +44,7 @@
<title>Installation of Gettext</title>
<para>For our temporary set of tools, we only need to build and install
- one binary from Gettext.</para>
+ three programs from Gettext.</para>
<para>Prepare Gettext for compilation:</para>
@@ -76,16 +76,19 @@
<para>Compile the package:</para>
<screen><userinput remap="make">make -C gnulib-lib
-make -C src msgfmt</userinput></screen>
+make -C src msgfmt
+make -C src msgmerge
+make -C src xgettext</userinput></screen>
- <para>As only one binary has been compiled, it is not possible to run the
+ <para>As only three prograsm have been compiled, it is not possible to run
the
test suite without compiling additional support libraries from the Gettext
package. It is therefore not recommended to attempt to run the test suite
at
this stage.</para>
- <para>Install the <command>msgfmt</command> binary:</para>
+ <para>Install the <command>msgfmt</command>, <command>msgmerge</command>
and
+ <command>xgettext</command> programs:</para>
-<screen><userinput remap="install">cp -v src/msgfmt
/tools/bin</userinput></screen>
+<screen><userinput remap="install">cp -v src/{msgfmt,msgmerge,xgettext}
/tools/bin</userinput></screen>
</sect2>
Modified: trunk/BOOK/chapter05/util-linux.xml
==============================================================================
--- trunk/BOOK/chapter05/util-linux.xml Wed Feb 19 03:59:48 2014 (r10488)
+++ trunk/BOOK/chapter05/util-linux.xml Wed Feb 19 14:21:37 2014 (r10489)
@@ -75,7 +75,7 @@
<para>Setting this envronment variable prevents adding unneeded
features that may be available on the host. Note that the location
shown for setting this environment variable is different from other
- LFS sections where variables are set preceeding the command. This
+ LFS sections where variables are set preceding the command. This
location is shown to demonstrate an alternative way of setting an
environment variable when using configure.</para>
</listitem>
Modified: trunk/BOOK/chapter06/findutils.xml
==============================================================================
--- trunk/BOOK/chapter06/findutils.xml Wed Feb 19 03:59:48 2014 (r10488)
+++ trunk/BOOK/chapter06/findutils.xml Wed Feb 19 14:21:37 2014 (r10489)
@@ -89,11 +89,9 @@
<segmentedlist>
<segtitle>Installed programs</segtitle>
- <segtitle>Installed directory</segtitle>
<seglistitem>
<seg>bigram, code, find, frcode, locate, oldfind, updatedb, and
xargs</seg>
- <seg>/usr/lib/findutils</seg>
</seglistitem>
</segmentedlist>
Modified: trunk/BOOK/chapter06/kmod.xml
==============================================================================
--- trunk/BOOK/chapter06/kmod.xml Wed Feb 19 03:59:48 2014 (r10488)
+++ trunk/BOOK/chapter06/kmod.xml Wed Feb 19 14:21:37 2014 (r10489)
@@ -88,21 +88,19 @@
<screen><userinput remap="test">make check</userinput></screen>
- <para>Install the package, create symlinks for compatibility with
- Module-Init-Tools (the package that previously handled Linux kernel
- modules), and manually install the man pages. Also make sure that all
- libraries are in the correct directory: </para>
+ <para>Install the package, man pages, and create symlinks for
+ compatibility with Module-Init-Tools (the package that previously handled
+ Linux kernel modules). Also make sure that all libraries are in the
+ correct directory: </para>
<screen><userinput remap="install">make install
+make -C man install
for target in depmod insmod modinfo modprobe rmmod; do
ln -sv ../bin/kmod /sbin/$target
done
-ln -sv kmod /bin/lsmod
-
-cp -v man/*.5 /usr/share/man/man5
-cp -v man/*.8 /usr/share/man/man8</userinput></screen>
+ln -sv kmod /bin/lsmod</userinput></screen>
</sect2>
Modified: trunk/BOOK/prologue/architecture.xml
==============================================================================
--- trunk/BOOK/prologue/architecture.xml Wed Feb 19 03:59:48 2014
(r10488)
+++ trunk/BOOK/prologue/architecture.xml Wed Feb 19 14:21:37 2014
(r10489)
@@ -12,12 +12,13 @@
<para>The primary target architectures of LFS are the AMD/Intel x86 (32-bit)
and x86_64 (64-bit) CPUs. On the other hand, the instructions in this book are
-also known to work, with some modifications, with the Power PC CPU. To build a
-system that utilizes one of these CPUs, the main prerequisite, in addition to
-those on the next few pages, is an existing Linux system such as an earlier LFS
-installation, Ubuntu, Red Hat/Fedora, SuSE, or other distribution that targets
-the architecture that you have. Also note that a 32-bit distribution can be
-installed and used as a host system on a 64-bit AMD/Intel computer.</para>
+also known to work, with some modifications, with the Power PC and ARM CPUs. To
+build a system that utilizes one of these CPUs, the main prerequisite, in
+addition to those on the next few pages, is an existing Linux system such as an
+earlier LFS installation, Ubuntu, Red Hat/Fedora, SuSE, or other distribution
+that targets the architecture that you have. Also note that a 32-bit
+distribution can be installed and used as a host system on a 64-bit AMD/Intel
+computer.</para>
<para>Some other facts about 64-bit systems need to be added here. When
compared to a 32-bit system, the sizes of executable programs are slightly
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page
