Changeset e043985

Timestamp:

02/19/2014 10:21:37 PM (10 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 7.5, 7.6, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

4e8a532

Parents:

b83d43e

Message:

Spelling and other general cleanup.
Use better method for installing kmod man pages.

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10489 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Files:

• chapter01/changelog.xml (modified) (4 diffs)
• chapter05/gettext.xml (modified) (2 diffs)
• chapter05/util-linux.xml (modified) (1 diff)
• chapter06/findutils.xml (modified) (1 diff)
• chapter06/kmod.xml (modified) (2 diffs)
• prologue/architecture.xml (modified) (1 diff)

chapter01/changelog.xml

@@ -82 +82 @@
         </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>
@@ -201 +201 @@
           <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>
@@ -301 +301 @@
         <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>
@@ -453 +453 @@
         <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

chapter05/gettext.xml

@@ -45 +45 @@
 
     <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>
@@ -77 +77 @@
 
 <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>

chapter05/util-linux.xml

@@ -76 +76 @@
           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>

chapter06/findutils.xml

@@ -90 +90 @@
     <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>

chapter06/kmod.xml

@@ -89 +89 @@
 <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
@@ -100 +101 @@
 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>

prologue/architecture.xml

@@ -13 +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