From 06addba1bf3a118e47393051aed253f237a2b3d3 Mon Sep 17 00:00:00 2001
From: "Douglas R. Reno" <renodr@linuxfromscratch.org>
Date: Fri, 5 Mar 2021 01:10:02 +0000
Subject: [PATCH] Add systemd patch to allow systemd-rfkill to work on
 Linux-5.11+

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@12154 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 9 +++++++++
 chapter01/whatsnew.xml  | 6 +++---
 chapter08/systemd.xml   | 6 ++++--
 patches.ent             | 6 +++---
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 08a12ae00..18d954e43 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -42,6 +42,15 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
     -->
+    <listitem revision="systemd">
+      <para>2021-03-04</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Patch systemd-247 so that it will function with
+          Linux-5.11 API headers.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
       <para>2021-03-02</para>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index b44d74e76..8c861618f 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -281,9 +281,9 @@
     <!--<listitem>
       <para>meson-0.56.0-upstream_fix-1.patch</para>
     </listitem>-->
-    <!--<listitem>
-      <para>systemd-247-upstream_fixes-1.patch</para>
-    </listitem>-->
+    <listitem>
+      <para>systemd-247-upstream_fixes-2.patch</para>
+    </listitem>
 
   </itemizedlist>
 
diff --git a/chapter08/systemd.xml b/chapter08/systemd.xml
index 23f27e10a..e701376df 100644
--- a/chapter08/systemd.xml
+++ b/chapter08/systemd.xml
@@ -46,9 +46,11 @@
 <screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-gcc_10-fixes-2.patch</userinput></screen>
 -->
 
-    <para>First, apply a patch to fix some regressions:</para>
+    <!-- For linux-5.11's API headers changing the rfkill_event structure -->
+    <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-1.patch</userinput></screen>
+<screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-upstream_fixes-2.patch</userinput></screen>
 
     <para>Create a symlink to work around the xsltproc command not being installed:</para>
 
diff --git a/patches.ent b/patches.ent
index 316e85cac..5bbfc57ba 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-1.patch">
-<!ENTITY systemd-upstream-fixes-patch-md5 "573a166f3620875208f78bf4dc431c8b">
-<!ENTITY systemd-upstream-fixes-patch-size "8 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">