systemd installation process change

systemd: Fix a FTBFS related to GCC-9 by adding CFLAGS+=-Wno-format-overflow
Remove the obsolete meson option -Dkill-path
Add -Drpmmacrosdir=no to the meson command and remove the command+text as a result of that
Remove symlinks to Util-Linux libraries created earler in the installation process to prevent /tools contamination
Minor instruction/code cleanup

was r11635.

chapter01/changelog.xml

@@ -43,6 +43,17 @@
     appropriate for the entry or if needed the entire day's listitem.
        -->
 
+    <listitem revision="systemd">
+      <para>2019-07-12</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Fix an FTBFS for systemd and do minor text
+          and instructions improvements. Also, fix symlinks that were not
+          removed.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2019-06-29</para>
       <itemizedlist>

chapter06/systemd.xml

@@ -38,11 +38,6 @@
 
   <sect2 role="installation">
     <title>安装 systemd</title>
-    <!--
-    <para>应用一个补丁，修复两项致命的安全缺陷：</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../systemd-240-security_fixes-2.patch</userinput></screen>
-    -->
 
     <para>创建一个符号链接，绕过不存在的 xsltproc：</para>
 
@@ -77,13 +72,16 @@ done</userinput></screen>
     <systemitem class="groupname">render</systemitem>：</para>
 
 <screen><userinput remap="pre">sed -i 's/GROUP="render", //' rules/50-udev-default.rules.in</userinput></screen>
+<!-- EDITORS NOTE: At the next systemd release, see if the CFLAGS can be removed. -->
+
     <para>准备安装 systemd：</para>
 
-    <screen><userinput remap="configure">mkdir -p build
+<screen><userinput remap="configure">mkdir -p build
 cd       build
 
 PKG_CONFIG_PATH="/usr/lib/pkgconfig:/tools/lib/pkgconfig" \
 LANG=en_US.UTF-8                   \
+CFLAGS+="-Wno-format-overflow"     \
 meson --prefix=/usr                \
       --sysconfdir=/etc            \
       --localstatedir=/var         \
@@ -92,7 +90,6 @@ meson --prefix=/usr                \
       -Ddefault-dnssec=no          \
       -Dfirstboot=false            \
       -Dinstall-tests=false        \
-      -Dkill-path=/bin/kill        \
       -Dkmod-path=/bin/kmod        \
       -Dldconfig=false             \
       -Dmount-path=/bin/mount      \
@@ -103,6 +100,7 @@ meson --prefix=/usr                \
       -Dsysusers=false             \
       -Dumount-path=/bin/umount    \
       -Db_lto=false                \
+      -Drpmmacrosdir=no            \
       ..</userinput></screen>
 
     <variablelist>
@@ -175,6 +173,13 @@ meson --prefix=/usr                \
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><parameter>-Drpmmacrosdir=no</parameter></term>
+        <listitem>
+          <para>该选项禁止安装用于 systemd 的 RPM 宏，
+          因为 LFS 并不支持 RPM。</para>
+        </listitem>
+      </varlistentry>
     </variablelist>
 
     <para>编译该软件包：</para>
@@ -189,10 +194,13 @@ meson --prefix=/usr                \
 
 <screen><userinput remap="install">LANG=en_US.UTF-8 ninja install</userinput></screen>
 
-    <para>删除不需要的目录和文件：</para>
+    <para>删除一个不再必要的符号链接：</para>
+
+<screen><userinput remap="install">rm -f /usr/bin/xsltproc</userinput></screen>
+
+    <para>删除指向 Util-Linux 库的符号链接：</para>
 
-<screen><userinput remap="install">rm -rfv /usr/lib/rpm
-rm -f /usr/bin/xsltproc</userinput></screen>
+<screen><userinput remap="install">rm -fv /usr/lib/lib{blkid,uuid,mount}.so*</userinput></screen>
 
     <para>创建 <command>systemd-journald</command> 需要的
     <filename>/etc/machine-id</filename> 文件：</para>

general-orig.ent

@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20190629">
+<!ENTITY version         "SVN-20190712">
 <!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        "20190629-systemd">
+<!ENTITY versiond        "20190712-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "June 29, 2019">
+<!ENTITY releasedate     "July 12th, 2019">
 
 <!ENTITY copyrightdate   "1999-2019"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "8.5">