Merge branch 'trunk' into multilib

chapter01/changelog.xml

@@ -44,6 +44,16 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
     -->
+    <listitem>
+      <para>2021-05-17</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Tweak install directories for eudev and e2fsprogs.
+          Thanks to Ryan Marsaw for the report.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2021-05-14</para>
       <itemizedlist>

chapter06/findutils.xml

@@ -45,8 +45,9 @@
 
     <para>Prepare Findutils for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr   \
+<screen><userinput remap="configure">./configure --prefix=/usr                   \
-            --host=$LFS_TGT \
+            --localstatedir=/var/lib/locate \
+            --host=$LFS_TGT                 \
             --build=$(build-aux/config.guess)</userinput></screen>
 
     <para>Compile the package:</para>

chapter07/createfiles.xml

@@ -83,7 +83,7 @@ systemd-resolve:x:77:77:systemd Resolver:/:/bin/false
 systemd-timesync:x:78:78:systemd Time Synchronization:/:/bin/false
 systemd-coredump:x:79:79:systemd Core Dumper:/:/bin/false
 uuidd:x:80:80:UUID Generation Daemon User:/dev/null:/bin/false
-systemd-oomd:x:81:81:systemd Out Of Memory Daemon:/:/bin/false
+systemd-oom:x:81:81:systemd Out Of Memory Daemon:/:/bin/false
 nobody:x:99:99:Unprivileged User:/dev/null:/bin/false</literal>
 EOF</userinput></screen>
 
@@ -153,7 +153,7 @@ systemd-resolve:x:77:
 systemd-timesync:x:78:
 systemd-coredump:x:79:
 uuidd:x:80:
-systemd-oomd:x:81:81:
+systemd-oom:x:81:81:
 wheel:x:97:
 nogroup:x:99:
 users:x:999:</literal>

chapter08/bzip2.xml

@@ -89,9 +89,13 @@ make clean</userinput></screen>
 ln -sv libbz2.so.&bzip2-version; /usr/lib/libbz2.so</userinput></screen>
 
     <para>Install the shared <command>bzip2</command> binary into the
-    <filename class="directory">/usr/bin</filename> directory:</para>
+    <filename class="directory">/usr/bin</filename> directory, and replace
+    two copies of <command>bzip2</command> with symlinks:</para>
 
-<screen><userinput remap="install">cp -v bzip2-shared /usr/bin/bzip2</userinput></screen>
+<screen><userinput remap="install">cp -v bzip2-shared /usr/bin/bzip2
+for i in /usr/bin/{bzcat,bunzip2}; do
+  ln -sfv bzip2 $i
+done</userinput></screen>
 
     <para>Remove an useless static library:</para>
 

chapter08/e2fsprogs.xml

@@ -53,6 +53,7 @@ cd       build</userinput></screen>
     <para>Prepare e2fsprogs for compilation:</para>
 
 <screen><userinput remap="configure">../configure --prefix=/usr           \
+             --sysconfdir=/etc       \
              --enable-elf-shlibs     \
              --disable-libblkid      \
              --disable-libuuid       \

chapter08/eudev.xml

@@ -53,6 +53,7 @@
     <para>Prepare Eudev for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr           \
+            --bindir=/usr/sbin      \
             --sysconfdir=/etc       \
             --enable-manpages       \
             --disable-static</userinput></screen>