aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDouglas R. Reno <renodr@linuxfromscratch.org>2018-08-03 21:36:40 +0000
committerDouglas R. Reno <renodr@linuxfromscratch.org>2018-08-03 21:36:40 +0000
commit8125d4986c555d6bdbfd2f11529616cbc76dbfb5 (patch)
tree22407b004d042b7f45b94053018cf6af2d0ac91e
parentefca30a736007825e0089a0dbfe8db3f1d98dc20 (diff)
Fix a build failure with glibc-2.28
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11444 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml10
-rw-r--r--chapter03/patches.xml8
-rw-r--r--chapter06/systemd.xml9
-rw-r--r--general.ent6
-rw-r--r--patches.ent4
5 files changed, 27 insertions, 10 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index da6bd2b21..c53de52db 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -42,6 +42,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] - Add patch to systemd to fix a build failure with
+ glibc-2.28.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
<listitem>
<para>2018-08-02</para>
<itemizedlist>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index ae7f7a795..f7e71bd64 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -126,6 +126,14 @@
</varlistentry>
-->
+ <varlistentry revision="systemd">
+ <term>systemd glibc patch - <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>Total size of these patches: about <returnvalue/></para>
diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml
index 2c913e325..e5d89b833 100644
--- a/chapter06/systemd.xml
+++ b/chapter06/systemd.xml
@@ -52,14 +52,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>Apply a patch to fix a build failure with 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>Remove an unneeded group,
<systemitem class="groupname">render</systemitem>, from the default udev
diff --git a/general.ent b/general.ent
index 39ada3683..e47f542da 100644
--- a/general.ent
+++ b/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 "20180801-systemd">
+<!ENTITY versiond "20180803-systemd">
<!ENTITY short-versiond "systemd">
<!ENTITY generic-versiond "systemd">
-<!ENTITY releasedate "August 2, 2018">
+<!ENTITY releasedate "August 3, 2018">
<!ENTITY copyrightdate "1999-2018"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "8.3">
diff --git a/patches.ent b/patches.ent
index 0b557a7a9..461646a6b 100644
--- a/patches.ent
+++ b/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">