Browse Source

Fix a build failure with glibc-2.28

was r11444.

Now the patch has not been uploaded yet.  See
<http://svn.linuxfromscratch.org/patches/trunk/systemd/systemd-239-glibc_statx_fix-1.patch>
Douglas R. Reno 7 years ago
parent
commit
7b43710ff3
5 changed files with 27 additions and 10 deletions
  1. 10 0
      chapter01/changelog.xml
  2. 8 0
      chapter03/patches.xml
  3. 2 7
      chapter06/systemd.xml
  4. 3 3
      general.ent
  5. 4 0
      patches.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-08-03</para>
+      <itemizedlist>
+        <listitem>
+           <para>[renodr] - 增加 systemd 补丁,
+           解决使用 glibc-2.28 时构建失败的问题。</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2018-08-02</para>
       <itemizedlist>

+ 8 - 0
chapter03/patches.xml

@@ -129,6 +129,14 @@
     </varlistentry>
 -->
 
+    <varlistentry revision="systemd">
+      <term>systemd glibc 补丁 - <token>&systemd-glibc-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&systemd-glibc-patch;"/></para>
+        <para>MD5 sum: <literal>&systemd-glibc-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
   </variablelist>
 
   <para>以上补丁的总大小: 约 <returnvalue/></para>

+ 2 - 7
chapter06/systemd.xml

@@ -51,14 +51,9 @@
 
 <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>Make some fixes from upstream:</para>
+    <para>应用一个补丁,以修正使用 glibc-2.28 时构建失败的问题:</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>
--->
+<screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-glibc_statx_fix-1.patch</userinput></screen>
 
     <para>从默认的 udev 规则中删除不必要的组
     <systemitem class="groupname">render</systemitem>:</para>

+ 3 - 3
general.ent

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

+ 4 - 0
patches.ent

@@ -62,3 +62,7 @@
 <!ENTITY systemd-security-patch-md5 "aa9d81fec9a3875a54e63af86904513a">
 <!ENTITY systemd-security-patch-size "4 KB">
 -->
+
+<!ENTITY systemd-glibc-patch "systemd-&systemd-version;-glibc_statx_fix-1.patch">
+<!ENTITY systemd-glibc-patch-md5 "a44057d6a6ca69760bafc126458d89e5">
+<!ENTITY systemd-glibc-patch-size "4 KB">