Don't build util-linux in Chapter 5

Clean up of unneeded symbolic links.
Reordered packages so version specific packages are
built as late as possible in Chapter 6. Now building
util-linux in Chapter 5 is unneeded and has been removed.

Update to eudev-3.2.6.
Update to elfutils-0.174 (libelf).
Update to psmisc-23.2.
Update to openssl-1.1.1.
Update to linux-4.18.9.

was r11472.

chapter01/changelog.xml

@@ -42,6 +42,39 @@
     appropriate for the entry or if needed the entire day's listitem.
 -->
 
+    <listitem>
+      <para>2018-09-20</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - 清理不必要的符号链接。
+          重新排列软件包的顺序，尽可能晚地构建版本相关的软件包。
+          现在不需要在第 5 章中构建 util-linux，因此将其移除。
+          修复 <ulink url="&lfs-ticket-root;4345">#4345</ulink> 和
+          <ulink url="&lfs-ticket-root;4349">#4349</ulink>。</para>
+        </listitem>
+        <listitem revision='sysv'>
+          <para>[bdubbs] - 更新到 eudev-3.2.6。修复
+          <ulink url="&lfs-ticket-root;4350">#4350</ulink>。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - 更新到 elfutils-0.174 (libelf)。修复
+          <ulink url="&lfs-ticket-root;4348">#4348</ulink>。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - 更新到 psmisc-23.2。修复
+          <ulink url="&lfs-ticket-root;4347">#4347</ulink>。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - 更新到 openssl-1.1.1。修复
+          <ulink url="&lfs-ticket-root;4346">#4346</ulink>。</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - 更新到 linux-4.18.9。修复
+          <ulink url="&lfs-ticket-root;4344">#4344</ulink>。</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2018-09-02</para>
       <itemizedlist>

chapter01/whatsnew.xml

@@ -69,9 +69,9 @@
     <!--<listitem>
       <para>Diffutils-&diffutils-version;</para>
     </listitem>-->
-    <!--<listitem revision="sysv">
+    <listitem revision="sysv">
       <para>Eudev-&eudev-version;</para>
-   </listitem>-->
+   </listitem>
    <listitem>
       <para>E2fsprogs-&e2fsprogs-version;</para>
    </listitem>
@@ -150,18 +150,18 @@
     <!--<listitem>
       <para>Libcap-&libcap-version;</para>
     </listitem>-->
-    <!--<listitem>
-      <para>Libelf-&elfutils-version;</para>
-   </listitem>-->
+    <listitem>
+      <para>Libelf-&elfutils-version; (from elfutils)</para>
+   </listitem>
    <!--<listitem>
       <para>Libpipeline-&libpipeline-version;</para>
    </listitem>-->
     <!--<listitem>
       <para>Libtool-&libtool-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Linux-&linux-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>M4-&m4-version;</para>
     </listitem>-->
@@ -186,9 +186,9 @@
    <!--<listitem>
       <para>Ncurses-&ncurses-version;</para>
    </listitem>-->
-   <!--<listitem>
+   <listitem>
       <para>Openssl-&openssl-version;</para>
-   </listitem>-->
+   </listitem>
    <!-- <listitem>
       <para>Patch-&patch-version;</para>
    </listitem>-->
@@ -201,9 +201,9 @@
     <!--<listitem>
       <para>Procps-ng-&procps-ng-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Psmisc-&psmisc-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Python-&python-version;</para>
     </listitem>-->

chapter05/chapter05.xml

@@ -24,7 +24,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tcl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="expect.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dejagnu.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="check.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bash.xml"/>
@@ -44,7 +43,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="stripping.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="changingowner.xml"/>

chapter05/make.xml

@@ -42,7 +42,7 @@
   <sect2 role="installation">
     <title>安装 Make</title>
 
-    <para>首先解决一个由 Glibc-2.27 引入的错误：</para>
+    <para>首先解决一个由 Glibc-2.27 及更新版本导致的错误：</para>
 
 <screen><userinput remap="pre">sed -i '211,217 d; 219,229 d; 232 d' glob/glob.c</userinput></screen>
 

chapter06/chapter06.xml

@@ -39,7 +39,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="acl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sed.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shadow.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iana-etc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bison.xml"/>
@@ -65,12 +64,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="python.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ninja.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="meson.xml"/>
-
-  <!-- systemd only -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="procps.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="check.xml"/> 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="diffutils.xml"/>
@@ -85,20 +78,24 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpipeline.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="patch.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="e2fsprogs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="man-db.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tar.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="texinfo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vim.xml"/>
 
   <!-- systemd only -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dbus.xml"/>
+  <!-- props needs libsystemd -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="procps.xml"/>
 
   <!-- sysv only -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysklogd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="eudev.xml"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="man-db.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutdebug.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="strippingagain.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="revisedchroot.xml"/>

chapter06/createfiles.xml

@@ -42,40 +42,27 @@
 	  为了满足它们的要求，需要创建一些符号链接。在本章的后续内容中，
 	  它们将被安装好的软件包中真正的文件替代：</para>
 
-<!--
-<screen revision="sysv"><userinput>ln -sv /tools/bin/{bash,cat,dd,echo,ln,pwd,rm,stty} /bin
-ln -sv /tools/bin/{install,perl} /usr/bin
-ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
-ln -sv /tools/lib/libstdc++.{a,so{,.6}} /usr/lib
-ln -sv bash /bin/sh
+<screen><userinput>ln -sv /tools/bin/{bash,cat,dd,echo,ln,pwd,rm,stty} /bin
+ln -sv /tools/bin/{env,install,perl}                /usr/bin
+ln -sv /tools/lib/libgcc_s.so{,.1}                  /usr/lib
+ln -sv /tools/lib/libstdc++.{a,so{,.6}}             /usr/lib
 
+install -vdm755 /usr/lib/pkgconfig
 
-</userinput></screen>
--->
-<!--sed 's/tools/usr/' /tools/lib/libstdc++.la > /usr/lib/libstdc++.la -->
+ln -sv bash /bin/sh</userinput></screen>
 
-<!--<screen revision="systemd"><userinput>ln -sv /tools/bin/{bash,cat,dd,echo,ln,pwd,rm,stty} /bin-->
-<screen><userinput>ln -sv /tools/bin/{bash,cat,dd,echo,ln,pwd,rm,stty} /bin
-ln -sv /tools/bin/{env,install,perl} /usr/bin
-ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
-ln -sv /tools/lib/libstdc++.{a,so{,.6}} /usr/lib
-for lib in blkid lzma mount uuid
+<!--for lib in blkid lzma mount uuid
 do
     ln -sv /tools/lib/lib$lib.so* /usr/lib
-done
-ln -svf /tools/include/blkid    /usr/include
+done-->
+<!--ln -svf /tools/include/blkid    /usr/include
 ln -svf /tools/include/libmount /usr/include
-ln -svf /tools/include/uuid     /usr/include
-install -vdm755 /usr/lib/pkgconfig
-for pc in blkid mount uuid
+ln -svf /tools/include/uuid     /usr/include-->
+<!--for pc in blkid mount uuid
 do
     sed 's@tools@usr@g' /tools/lib/pkgconfig/${pc}.pc \
         > /usr/lib/pkgconfig/${pc}.pc
-done
-ln -sv bash /bin/sh</userinput></screen>
-
-<!--sed 's/tools/usr/' /tools/lib/libstdc++.la > /usr/lib/libstdc++.la
-   sed 's/tools/usr/' /tools/lib/lib${lib}.la > /usr/lib/lib${lib}.la-->
+done-->
   <variablelist>
     <title>每个链接的目的：</title>
 
@@ -112,6 +99,14 @@ ln -sv bash /bin/sh</userinput></screen>
       </listitem>
     </varlistentry>
 
+    <varlistentry>
+      <term><parameter><filename>/usr/bin/env</filename></parameter></term>
+      <listitem>
+        <para>This pathname is hard-coded into some packages build procedures.
+        <!-- systemd  This may not be needed if we move sysd to the end--></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry>
       <term><parameter><filename>/usr/bin/install</filename></parameter></term>
       <listitem>
@@ -197,14 +192,14 @@ ln -sv bash /bin/sh</userinput></screen>
     </varlistentry>
 -->
     <!--<varlistentry revision="systemd">-->
-    <varlistentry>
+<!--    <varlistentry>
       <term><parameter><filename>/usr/lib/lib{blkid,lzma,mount,uuid}.{a,la,so*}</filename></parameter></term>
       <listitem>
         <para>这些链接防止一些工具获得指向
 			<filename class="directory">/tools</filename>
 			目录的不必要的引用。</para>
       </listitem>
-    </varlistentry>
+    </varlistentry>-->
 
     <varlistentry>
       <term><parameter><filename>/bin/sh</filename></parameter></term>

chapter06/e2fsprogs.xml

@@ -115,11 +115,17 @@ PKG_CONFIG_PATH=/tools/lib/pkgconfig \
 
 <screen><userinput remap="make">make</userinput></screen>
 
-    <para>为了设定和运行测试套件，我们首先要从 /tools/lib
-    	链接一些库到测试程序的搜索位置。执行以下命令运行测试：</para>
+<!--
+    <para>To set up and run the test suite we need to first link some 
+    libraries from /tools/lib to a location where the test programs look.
+    To run the tests, issue:</para>
+-->
+
+    <para>执行以下命令，以运行测试：</para>
 
-<screen><userinput remap="test">ln -sfv /tools/lib/lib{blk,uu}id.so.1 lib
-make LD_LIBRARY_PATH=/tools/lib check</userinput></screen>
+<screen><userinput remap="test">make check</userinput></screen>
+<!--ln -sfv /tools/lib/lib{blk,uu}id.so.1 lib -->
+<!--make LD_LIBRARY_PATH=/tools/lib check</userinput></screen>-->
 
     <!--para>One of the E2fsprogs tests will attempt to allocate 256 MB of memory.
     If you do not have significantly more RAM than this, be sure to enable

chapter06/libelf.xml

@@ -14,7 +14,7 @@
     <address>&elfutils-url;</address>
   </sect1info>
 
-  <title>Libelf &elfutils-version;</title>
+  <title>Elfutils-&elfutils-version; 中的 Libelf</title>
 
   <indexterm zone="ch-system-libelf">
     <primary sortas="a-Libelf">Libelf</primary>

chapter06/make.xml

@@ -40,7 +40,7 @@
   <sect2 role="installation">
     <title>安装 Make</title>
 
-    <para>再一次地，绕过 glibc-2.27 引入的一个问题：</para>
+    <para>再一次地，绕过 glibc-2.27 和更新版本导致的一个问题：</para>
 
 <screen><userinput remap="pre">sed -i '211,217 d; 219,229 d; 232 d' glob/glob.c</userinput></screen>
     <para>准备安装 Make：</para>

general.ent

@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20180902">
+<!ENTITY version         "SVN-20180920">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
                                       Change to x.y for release but not -rc releases -->
 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
-<!ENTITY versiond        "20180902-systemd">
+<!ENTITY versiond        "20180920-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "2018 年 9 月 2 日">
+<!ENTITY releasedate     "2018 年 9 月 20 日">
 
 <!ENTITY copyrightdate   "1999-2018"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "8.3">

packages.ent

@@ -142,18 +142,18 @@
 <!ENTITY e2fsprogs-ch6-du "96 MB">
 <!ENTITY e2fsprogs-ch6-sbu "1.6 SBU">
 
-<!ENTITY elfutils-version "0.173">
-<!ENTITY elfutils-size "8,482 KB">
+<!ENTITY elfutils-version "0.174">
+<!ENTITY elfutils-size "8,497 KB">
 <!ENTITY elfutils-url "https://sourceware.org/ftp/elfutils/&elfutils-version;/elfutils-&elfutils-version;.tar.bz2">
-<!ENTITY elfutils-md5 "35decb1ebfb90d565e4c411bee4185cc">
+<!ENTITY elfutils-md5 "48bec24c0c8b2c16820326956dff9378">
 <!ENTITY elfutils-home "https://sourceware.org/ftp/elfutils/">
 <!ENTITY elfutils-ch6-du "91 MB">
 <!ENTITY elfutils-ch6-sbu "1.0 SBU">
 
-<!ENTITY eudev-version "3.2.5">
-<!ENTITY eudev-size "1,814 KB">
+<!ENTITY eudev-version "3.2.6">
+<!ENTITY eudev-size "1,849 KB">
 <!ENTITY eudev-url "https://dev.gentoo.org/~blueness/eudev/eudev-&eudev-version;.tar.gz">
-<!ENTITY eudev-md5 "6ca08c0e14380f87df8e8aceac123671">
+<!ENTITY eudev-md5 "902c4cdc9235838067cc69978a780e72">
 <!ENTITY eudev-ch6-du "81 MB">
 <!ENTITY eudev-ch6-sbu "0.2 SBU">
 
@@ -413,12 +413,12 @@
 
 <!ENTITY linux-major-version "4">
 <!ENTITY linux-minor-version "18">
-<!ENTITY linux-patch-version "5">
+<!ENTITY linux-patch-version "9">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;"> -->
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "99,411 KB">
+<!ENTITY linux-size "99,413 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "22851fe6c82db6673a844bbb7c62df67">
+<!ENTITY linux-md5 "6f082741ab20f03a334fe533d533880e">
 <!ENTITY linux-home "https://www.kernel.org/">
 <!-- measured for 4.8.3 / gcc-6.2.0 on x86_64 : minimum is
  allnoconfig extended for a hopefully-bootable build on desktop machine,
@@ -509,10 +509,10 @@
 <!ENTITY ninja-ch6-du "83 MB">
 <!ENTITY ninja-ch6-sbu "0.2 SBU">
 
-<!ENTITY openssl-version "1.1.0i">
-<!ENTITY openssl-size "5,326 KB">
+<!ENTITY openssl-version "1.1.1">
+<!ENTITY openssl-size "8,143 KB">
 <!ENTITY openssl-url "https://openssl.org/source/openssl-&openssl-version;.tar.gz">
-<!ENTITY openssl-md5 "9495126aafd2659d357ea66a969c3fe1">
+<!ENTITY openssl-md5 "7079eb017429e0ffb9efb42bf80ccb21">
 <!ENTITY openssl-home "https://www.openssl.org/">
 <!ENTITY openssl-ch6-du "75 MB">
 <!ENTITY openssl-ch6-sbu "1.7 SBU">
@@ -553,10 +553,11 @@
 <!ENTITY procps-ng-ch6-du "17 MB">
 <!ENTITY procps-ng-ch6-sbu "0.1 SBU">
 
-<!ENTITY psmisc-version "23.1">
-<!ENTITY psmisc-size "290 KB">
-<!ENTITY psmisc-url "https://sourceforge.net/projects/psmisc/files/psmisc/psmisc-&psmisc-version;.tar.xz">
-<!ENTITY psmisc-md5 "bbba1f701c02fb50d59540d1ff90d8d1">
+<!ENTITY psmisc-version "23.2">
+<!ENTITY psmisc-size "292 KB">
+<!ENTITY psmisc-url "https://sourceforge.net/projects/psmisc/files/psmisc&#37;20devel/psmisc-&psmisc-version;.tar.xz">
+<!-- &#37; is a percent sign - results in %20 (a space in a URL -->
+<!ENTITY psmisc-md5 "17b72c193b090f379fedf573123e89b8">
 <!ENTITY psmisc-home "http://psmisc.sourceforge.net/">
 <!ENTITY psmisc-ch6-du "4.3 MB">
 <!ENTITY psmisc-ch6-sbu "不到 0.1 SBU">