From d7a942197e713339d4dc1eedab4dafd4179a5cd8 Mon Sep 17 00:00:00 2001
From: "Douglas R. Reno" <renodr@linuxfromscratch.org>
Date: Tue, 11 May 2021 23:24:11 -0500
Subject: Merge Xi's changes into trunk Update to meson-0.58.0 Update to
 systemd-248 Update to gcc-11.1.0 Update to linux-5.12.1 Update to
 iproute2-5.12.0 Update to Python-3.9.5 Make /bin, /sbin, and /lib symlinks to
 their counterparts in /usr. Thanks again for a significant portion of this
 work goes to Xi, I only really merged it and made a couple of modifications
 for my updates. To LFS 11.x we go!

---
 chapter01/changelog.xml | 38 ++++++++++++++++++++++++++++++++++++++
 chapter01/whatsnew.xml  |  8 ++++----
 2 files changed, 42 insertions(+), 4 deletions(-)

(limited to 'chapter01')

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 413b55d0d..7c2847310 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -42,6 +42,44 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
     -->
+    <listitem>
+      <para>2021-05-12</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Moved LFS to a merged-/usr configuration. Thanks
+          goes to Xi Ruoyao for doing almost all of the work. Fixes
+          <ulink url="&lfs-ticket-root;4848">#4848</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to gcc-11.1.0. Fixes
+          <ulink url="&lfs-ticket-root;4847">#4847</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Fix a FTBFS when building glibc-2.30 with
+          gcc-11.1.0.</para>
+        </listitem>
+        <listitem revision="systemd">
+          <para>[renodr] - Update to systemd-248. Fixes
+          <ulink url="&lfs-ticket-root;4841">#4841</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to iproute2-5.12.0. Fixes
+          <ulink url="&lfs-ticket-root;4852">#4852</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to Python-3.9.5. Fixes
+          <ulink url="&lfs-ticket-root;4854">#4854</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to meson-0.58.0. Fixes
+          <ulink url="&lfs-ticket-root;4853">#4853</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to linux-5.12.2. Fixes
+          <ulink url="&lfs-ticket-root;4840">#4840</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
       <para>2021-04-28</para>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 0946a7978..2d54dee9e 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -96,9 +96,9 @@
     <!--<listitem>
       <para>Gawk-&gawk-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
        <para>GCC-&gcc-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
        <para>GDBM-&gdbm-version;</para>
     </listitem>-->
@@ -228,9 +228,9 @@
     <listitem revision="sysv">
       <para>Sysklogd-&sysklogd-version;</para>
     </listitem>
-    <!--<listitem revision="systemd">
+    <listitem revision="systemd">
       <para>Systemd-&systemd-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem revision="sysv">
       <para>SysVinit-&sysvinit-version;</para>
     </listitem>
-- 
cgit v1.2.3-54-g00ecf