aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDouglas R. Reno <renodr@linuxfromscratch.org>2021-04-28 20:29:58 -0500
committerDouglas R. Reno <renodr@linuxfromscratch.org>2021-04-28 20:29:58 -0500
commit99ee345ad67861dbaa41810874f35fbf593a2f50 (patch)
treef6c820af31308f28b53c5bd70c4adcf1d18e054e
parent49e360b9b52900bdda162467c1d01244379c093b (diff)
Patch systemd to build with meson-0.57.2 and Linux-API-Headers-5.11.14
and higher.
-rw-r--r--chapter01/changelog.xml5
-rw-r--r--chapter08/systemd.xml2
-rw-r--r--patches.ent6
3 files changed, 9 insertions, 4 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index c588665bb..413b55d0d 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -46,6 +46,11 @@
<listitem>
<para>2021-04-28</para>
<itemizedlist>
+ <listitem revision="systemd">
+ <para>[renodr] - Fix building systemd with Linux-API-Headers 5.11.14
+ and higher, as well as with meson-0.57.2. Fixes
+ <ulink url="&lfs-ticket-root;4851">#4851</ulink>.</para>
+ </listitem>
<listitem>
<para>[bdubbs] - Add manual locales needed for tests
if using alternate locale installation instructions. Fixes
diff --git a/chapter08/systemd.xml b/chapter08/systemd.xml
index b52a64e35..d5a9f6bd1 100644
--- a/chapter08/systemd.xml
+++ b/chapter08/systemd.xml
@@ -50,7 +50,7 @@
<para>First, apply a patch to fix some regressions and fix functionality
with future versions of the kernel:</para>
-<screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-upstream_fixes-2.patch</userinput></screen>
+<screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-upstream_fixes-3.patch</userinput></screen>
<para>Remove tests that cannot be built in chroot:</para>
diff --git a/patches.ent b/patches.ent
index 5bbfc57ba..62a45216d 100644
--- a/patches.ent
+++ b/patches.ent
@@ -67,6 +67,6 @@
<!ENTITY sysvinit-consolidated-patch-md5 "4900322141d493e74020c9cf437b2cdc">
<!ENTITY sysvinit-consolidated-patch-size "2.4 KB">
-<!ENTITY systemd-upstream-fixes-patch "systemd-&systemd-version;-upstream_fixes-2.patch">
-<!ENTITY systemd-upstream-fixes-patch-md5 "7afe3d13464ae7d20dbe5e6f0fb8ccd3">
-<!ENTITY systemd-upstream-fixes-patch-size "12 KB">
+<!ENTITY systemd-upstream-fixes-patch "systemd-&systemd-version;-upstream_fixes-3.patch">
+<!ENTITY systemd-upstream-fixes-patch-md5 "949768da539ddfa2bf6e936b81ed96df">
+<!ENTITY systemd-upstream-fixes-patch-size "16 KB">