Merge branch 'trunk' of git.linuxfromscratch.org:lfs into trunk

5 files changed, 42 insertions, 12 deletions

diff --git a/chapter08/binutils.xml b/chapter08/binutils.xml
index 5ff11a755..1fd436bd1 100644
--- a/chapter08/binutils.xml
+++ b/chapter08/binutils.xml
@@ -153,7 +153,7 @@ cd       build</userinput></screen>
 
     <para>Remove useless static libraries:</para>
 
-<screen><userinput remap="install">rm -fv /usr/lib/lib{bfd,ctf,ctf-nobfd,sframe,opcodes}.a</userinput></screen>
+<screen><userinput remap="install">rm -fv /usr/lib/lib{bfd,ctf,ctf-nobfd,gprofng,opcodes,sframe}.a</userinput></screen>
 
   </sect2>
 
@@ -168,7 +168,8 @@ cd       build</userinput></screen>
       <seglistitem>
         <seg>addr2line, ar, as, c++filt, dwp, elfedit, gprof, gprofng, ld, ld.bfd, ld.gold, nm,
         objcopy, objdump, ranlib, readelf, size, strings, and strip</seg>
-        <seg>libbfd.so, libctf.so, libctf-nobfd.so, libopcodes.so, and libsframe.so</seg>
+        <seg>libbfd.so, libctf.so, libctf-nobfd.so, libgprofng.so,
+        libopcodes.so, and libsframe.so</seg>
         <seg>/usr/lib/ldscripts</seg>
       </seglistitem>
     </segmentedlist>
@@ -416,6 +417,17 @@ cd       build</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="libgprofng">
+        <term><filename class="libraryfile">libgprofng</filename></term>
+        <listitem>
+          <para>A library containing most routines used by
+          <command>gprofng</command></para>
+          <indexterm zone="ch-system-binutils libgprofng">
+            <primary sortas="c-libgprofng">libgprofng</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="libopcodes">
         <term><filename class="libraryfile">libopcodes</filename></term>
         <listitem>
diff --git a/chapter08/coreutils.xml b/chapter08/coreutils.xml
index c72041b3b..7d715f2f3 100644
--- a/chapter08/coreutils.xml
+++ b/chapter08/coreutils.xml
@@ -116,7 +116,7 @@ FORCE_UNSAFE_CONFIGURE=1 ./configure \
     these tests are not skipped, add a temporary group and make the
     user <systemitem class="username">tester</systemitem> a part of it:</para>
 
-<screen><userinput remap="test">echo "dummy:x:102:tester" &gt;&gt; /etc/group</userinput></screen>
+<screen><userinput remap="test">groupadd -g 102 dummy -U tester</userinput></screen>
 
     <para>Fix some of the permissions so that the non-&root; user can
     compile and run the tests:</para>
@@ -134,7 +134,8 @@ FORCE_UNSAFE_CONFIGURE=1 ./configure \
 
     <para>Remove the temporary group:</para>
 
-<screen><userinput remap="test">sed -i '/dummy/d' /etc/group</userinput></screen>
+<screen><userinput remap="test">groupdel dummy</userinput></screen>
+
     <para>Install the package:</para>
 
 <screen><userinput remap="install">make install</userinput></screen>
diff --git a/chapter08/gawk.xml b/chapter08/gawk.xml
index a6b74460b..cc9348d90 100644
--- a/chapter08/gawk.xml
+++ b/chapter08/gawk.xml
@@ -61,12 +61,6 @@ su tester -c "PATH=$PATH make check"</userinput></screen>
 
 <screen><userinput remap="install">make LN='ln -f' install</userinput></screen>
 
-    <para>The installation process already created <command>awk</command>
-    as a symlink to <command>gawk</command>, create its man page as a
-    symlink as well:</para>
-
-<screen><userinput remap="install">ln -sv gawk.1 /usr/share/man/man1/awk.1</userinput></screen>
-
     <variablelist>
       <title>The meaning of the overridden make variable:</title>
 
@@ -79,6 +73,12 @@ su tester -c "PATH=$PATH make check"</userinput></screen>
       </varlistentry>
    </variablelist>
 
+    <para>The installation process already created <command>awk</command>
+    as a symlink to <command>gawk</command>, create its man page as a
+    symlink as well:</para>
+
+<screen><userinput remap="install">ln -sv gawk.1 /usr/share/man/man1/awk.1</userinput></screen>
+
     <para>If desired, install the documentation:</para>
 
 <screen><userinput remap="install">mkdir -pv                                   /usr/share/doc/gawk-&gawk-version;
diff --git a/chapter08/ncurses.xml b/chapter08/ncurses.xml
index 58221d144..b51099001 100644
--- a/chapter08/ncurses.xml
+++ b/chapter08/ncurses.xml
@@ -158,8 +158,7 @@ ln -sfv libncurses.so      /usr/lib/libcurses.so</userinput></screen>
 
     <para>If desired, install the Ncurses documentation:</para>
 
-<screen><userinput remap="install">mkdir -pv      /usr/share/doc/ncurses-&ncurses-version;
-cp -v -R doc/* /usr/share/doc/ncurses-&ncurses-version;</userinput></screen>
+<screen><userinput remap="install">cp -v -R doc -T /usr/share/doc/ncurses-&ncurses-version;</userinput></screen>
 
     <note>
 
diff --git a/chapter10/grub.xml b/chapter10/grub.xml
index 965fa56c3..f232a1675 100644
--- a/chapter10/grub.xml
+++ b/chapter10/grub.xml
@@ -150,6 +150,24 @@ menuentry "GNU/Linux, Linux &linux-version;-lfs-&version;" {
 }</literal>
 EOF</userinput></screen>
 
+    <para>
+      The <command>insmod</command> commands load the
+      <application>GRUB</application> modules named
+      <filename>part_gpt</filename> and <filename>ext2</filename>.
+      Despite the naming, <filename>ext2</filename> actually supports
+      <systemitem class='filesystem'>ext2</systemitem>,
+      <systemitem class='filesystem'>ext3</systemitem>, and
+      <systemitem class='filesystem'>ext4</systemitem> filesystems.
+      The <command>grub-install</command> command has embedded some modules
+      into the main <application>GRUB</application> image (installed into
+      the MBR or the GRUB BIOS partition) to access the other modules
+      (in <filename class='directory'>/boot/grub/i386-pc</filename>) without
+      a chicken-or-egg issue, so with a typical configuration these two
+      modules are already embedded and those two <command>insmod</command>
+      commands will do nothing.  But they do no harm anyway, and they may
+      be needed with some rare configurations.
+    </para>
+
     <note><para>From <application>GRUB</application>'s perspective, the
     kernel files are relative to the partition used.  If you
     used a separate /boot partition, remove /boot from the above