Преглед изворни кода

Update to systemd-239

was r11440.
Douglas R. Reno пре 7 година
родитељ
комит
415c2b6288
4 измењених фајлова са 24 додато и 17 уклоњено
  1. 10 0
      chapter01/changelog.xml
  2. 6 9
      chapter06/systemd.xml
  3. 3 3
      general.ent
  4. 5 5
      packages.ent

+ 10 - 0
chapter01/changelog.xml

@@ -41,6 +41,16 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
 -->
+    <listitem revision="systemd">
+      <para>2018-07-23</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - 更新到 systemd-239。 修复
+          <ulink url="&lfs-ticket-root;4298">#4298</ulink>。</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2018-07-18</para>
       <itemizedlist>

+ 6 - 9
chapter06/systemd.xml

@@ -49,15 +49,16 @@
 
     <para>删除在 chroot 环境中无法构建的测试:</para>
 
-<screen><userinput remap="pre">sed '171,$ d' -i src/resolve/meson.build</userinput></screen>
+<screen><userinput remap="pre">sed '166,$ d' -i src/resolve/meson.build</userinput></screen>
 
 <!-- These are from upstream.  There will probably be a new release shortly, 
-     so don't bother with a patch. -->
-    <para>进行一些由上游提供的修复:</para>
+     so don't bother with a patch.
+    <para>Make some fixes from upstream:</para>
 
 <screen><userinput remap="pre">sed -i '527,565 d'                  src/basic/missing.h
 sed -i '24 d'                       src/core/load-fragment.c
 sed -i '53 a#include &lt;sys/mount.h&gt;' src/shared/bus-unit-util.c</userinput></screen>
+-->
 
     <para>从默认的 udev 规则中删除不必要的组
     <systemitem class="groupname">render</systemitem>:</para>
@@ -176,8 +177,7 @@ meson --prefix=/usr                \
 
     <para>删除一个不需要的目录:</para>
 
-<screen><userinput remap="install">rm -rfv /usr/lib/rpm</userinput></screen>
-
+<screen><userinput remap="install">rm -rfv /usr/lib/rpm
 <!--
     <para>创建 Sysvinit 兼容性符号链接,使 systemd 被用作默认 init 系统:
     </para>
@@ -187,10 +187,7 @@ meson --prefix=/usr                \
 done
 ln -sfv ../lib/systemd/systemd /sbin/init</userinput></screen>
 -->
-
-    <para>删除之前创建的 xsltproc 符号链接:</para>
-
-<screen><userinput remap="install">rm -f /usr/bin/xsltproc</userinput></screen>
+rm -f /usr/bin/xsltproc</userinput></screen>
 
     <para>创建 <command>systemd-journald</command> 需要的
     <filename>/etc/machine-id</filename> 文件:</para>

+ 3 - 3
general.ent

@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20180718">
+<!ENTITY version         "SVN-20180723">
 <!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        "20180718-systemd">
+<!ENTITY versiond        "20180723-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "2018 年 7 月 18 日">
+<!ENTITY releasedate     "2018 年 7 月 23 日">
 
 <!ENTITY copyrightdate   "1999-2018"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "8.3">

+ 5 - 5
packages.ent

@@ -613,14 +613,14 @@
 <!ENTITY sysklogd-ch6-du "0.7 MB">
 <!ENTITY sysklogd-ch6-sbu "不到 0.1 SBU">
 
-<!ENTITY systemd-version  "238">
-<!ENTITY systemd-size     "6,792 KB">
+<!ENTITY systemd-version  "239">
+<!ENTITY systemd-size     "6,992 KB">
 <!ENTITY systemd-url      "&github;/systemd/systemd/archive/v&systemd-version;/systemd-&systemd-version;.tar.gz">
-<!ENTITY systemd-md5      "76db8004647283b779234364cd637d3c">
+<!ENTITY systemd-md5      "6137e3f50390391cf34521d071a1a078">
 <!ENTITY systemd-home     "https://www.freedesktop.org/wiki/Software/systemd/">
-<!ENTITY systemd-man-size "337 KB">
+<!ENTITY systemd-man-size "356 KB">
 <!ENTITY systemd-man-url  "&anduin-sources;/systemd-man-pages-&systemd-version;.tar.xz">
-<!ENTITY systemd-man-md5  "2e3f795bc0818e161c03b8cae9c99e80">
+<!ENTITY systemd-man-md5  "b3be99a8fff33c773f034151b16eb1b8">
 <!ENTITY systemd-ch6-du   "297 MB">
 <!ENTITY systemd-ch6-sbu  "1.1 SBU">