Merge changes

chapter01/changelog.xml

@@ -40,6 +40,28 @@
     appropriate for the entry or if needed the entire day's listitem.
     -->
 
+    <listitem>
+      <para>2022-08-06</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to binutils-2.38. Fixes
+          <ulink url="&lfs-ticket-root;5089">#5089</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to util-linux-2.38.1. Fixes
+          <ulink url="&lfs-ticket-root;5088">#5088</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to Python3-3.10.6. Fixes
+          <ulink url="&lfs-ticket-root;5087">#5087</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to glibc-2.36. Fixes
+          <ulink url="&lfs-ticket-root;5083">#5084</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2022-07-24</para>
       <itemizedlist>

chapter01/whatsnew.xml

@@ -44,9 +44,9 @@
     <listitem>
       <para>Bc &bc-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Binutils-&binutils-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Bison-&bison-version;</para>
     </listitem>-->
@@ -101,9 +101,9 @@
     <!--<listitem>
       <para>Gettext-&gettext-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Glibc-&glibc-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>GMP-&gmp-version;</para>
     </listitem>-->

chapter03/patches.xml

@@ -35,7 +35,7 @@
       </listitem>
     </varlistentry>
 -->
-
+<!--
     <varlistentry>
       <term>Binutils LTO Fix Patch - <token>&binutils-lto-patch-size;</token>:</term>
       <listitem>
@@ -43,7 +43,7 @@
         <para>MD5 sum: <literal>&binutils-lto-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
-
+-->
     <varlistentry>
       <term>Bzip2 Documentation Patch - <token>&bzip2-docs-patch-size;</token>:</term>
       <listitem>
@@ -68,15 +68,15 @@
       </listitem>
    </varlistentry>
 -->
-<!--
+
     <varlistentry>
-      <term>File Upstream Fixes Patch - <token>&file-upstream-fixes-patch-size;</token>:</term>
+      <term>Gcc glibc-2.36 Fixes Patch - <token>&gcc-upstream-fixes-patch-size;</token>:</term>
       <listitem>
-        <para>Download: <ulink url="&patches-root;&file-upstream-fixes-patch;"/></para>
+        <para>Download: <ulink url="&patches-root;&gcc-upstream-fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&file-upstream-fixes-md5;</literal></para>
+        <para>MD5 sum: <literal>&gcc-upstream-fixes-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
--->
+
     <varlistentry>
       <term>Glibc FHS Patch - <token>&glibc-fhs-patch-size;</token>:</term>
       <listitem>
@@ -135,6 +135,14 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry revision="systemd">
+      <term>Systemd Upstream Patch - <token>&systemd-upstream-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&systemd-upstream-patch;"/></para>
+        <para>MD5 sum: <literal>&systemd-upstream-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry>
       <term>Xz Upstream Fix Patch - <token>&xz-upstream-fix-patch-size;</token>:</term>
       <listitem>

chapter05/binutils-pass1.xml

@@ -74,6 +74,7 @@ cd       build</userinput></screen>
              --with-sysroot=$LFS \
              --target=$LFS_TGT   \
              --disable-nls       \
+             --enable-gprofng=no \
              --disable-werror</userinput></screen>
 <screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure">../configure --prefix=$LFS/tools       \
              --with-sysroot=$LFS \
@@ -121,6 +122,14 @@ cd       build</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><parameter>--enable-gprofng=no</parameter></term>
+        <listitem>
+          <para>This disables building gprofng which is not needed for the
+          temporary tools.</para>
+        </listitem>
+      </varlistentry>
+
       <varlistentry>
         <term><parameter>--disable-werror</parameter></term>
         <listitem>

chapter06/binutils-pass2.xml

@@ -64,6 +64,7 @@ cd       build</userinput></screen>
     --host=$LFS_TGT            \
     --disable-nls              \
     --enable-shared            \
+    --enable-gprofng=no        \
     --disable-werror           \
     --enable-64-bit-bfd</userinput></screen>
 <screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure">../configure                   \

chapter06/gcc-pass2.xml

@@ -43,6 +43,10 @@
   <sect2 role="installation">
     <title>Installation of GCC</title>
 
+    <para>First fix a problem with the latest version of glibc:</para>
+
+    <screen><userinput remap="pre">patch -Np1 -i ../&gcc-upstream-fixes-patch;</userinput></screen>
+
     <para>As in the first build of GCC, the GMP, MPFR, and MPC packages are
     required. Unpack the tarballs and move them into the required directory
     names:</para>

chapter08/binutils.xml

@@ -56,13 +56,13 @@
 
 <screen><computeroutput>The system has no more ptys.
 Ask your system administrator to create more.</computeroutput></screen>
-
+<!--
     <para>Upstream has made a patch to fix a problem when using binutils
     for building some BLFS packages with Link Time Optimization (LTO)
     enabled.  Apply that now:</para>
 
  <screen><userinput remap="pre">patch -Np1 -i ../&binutils-lto-patch;</userinput></screen>
-
+-->
 <!--
     <para>An error in the building system causes the shipped man pages to
     be empty.  Workaround the issue and remove the shipped man pages, so the
@@ -87,7 +87,9 @@ cd       build</userinput></screen>
 
     <para>Prepare Binutils for compilation:</para>
 
+<<<<<<< HEAD
 <screen arch="default"><userinput remap="configure">../configure --prefix=/usr       \
+             --sysconfdir=/etc   \
              --enable-gold       \
              --enable-ld=default \
              --enable-plugins    \
@@ -96,6 +98,7 @@ cd       build</userinput></screen>
              --enable-64-bit-bfd \
              --with-system-zlib</userinput></screen>
 <screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure">../configure --prefix=/usr       \
+             --sysconfdir=/etc   \
              --enable-gold       \
              --enable-ld=default \
              --enable-plugins    \

chapter08/gcc.xml

@@ -49,6 +49,10 @@
     -e 's/return kAltStackSize/return SIGSTKSZ * 4/' \
     -i libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cpp</userinput></screen>
 -->
+    <para>First fix a problem with the latest version of glibc:</para>
+
+    <screen><userinput remap="pre">patch -Np1 -i ../&gcc-upstream-fixes-patch;</userinput></screen>
+
     <para>If building on x86_64, change the default directory name for 64-bit
     libraries to <quote>lib</quote>:</para>
 

chapter08/systemd.xml

@@ -40,6 +40,10 @@
   <sect2 role="installation">
     <title>Installation of systemd</title>
 
+    <para>First, fix an issue introduced by glibc-2.36.</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&systemd-upstream-patch;</userinput></screen>
+
     <para>Remove two unneeded groups,
     <systemitem class="groupname">render</systemitem> and
     <systemitem class="groupname">sgx</systemitem>, from the default udev

packages.ent

@@ -66,10 +66,10 @@
 <!ENTITY bc-fin-du "7.1 MB">
 <!ENTITY bc-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY binutils-version "2.38">
+<!ENTITY binutils-version "2.39">
-<!ENTITY binutils-size "23,098 KB">
+<!ENTITY binutils-size "24,578 KB">
 <!ENTITY binutils-url "&gnu;binutils/binutils-&binutils-version;.tar.xz">
-<!ENTITY binutils-md5 "6e39cad1bb414add02b5b1169c18fdc5">
+<!ENTITY binutils-md5 "f7e986ae9ff06405cafb2e585ee36d27">
 <!ENTITY binutils-home "&gnu-software;binutils/">
 <!ENTITY binutils-tmpp1-du "620 MB">
 <!ENTITY binutils-tmpp1-sbu "1 SBU">
@@ -257,10 +257,10 @@
 <!ENTITY gettext-fin-du "233 MB">
 <!ENTITY gettext-fin-sbu "2.7 SBU">
 
-<!ENTITY glibc-version "2.35">
+<!ENTITY glibc-version "2.36">
-<!ENTITY glibc-size "17,741 KB">
+<!ENTITY glibc-size "18,175 KB">
 <!ENTITY glibc-url "&gnu;glibc/glibc-&glibc-version;.tar.xz">
-<!ENTITY glibc-md5 "dd571c67d85d89d7f60b854a4e207423">
+<!ENTITY glibc-md5 "00e9b89e043340f688bc93ec03239b57">
 <!ENTITY glibc-home "&gnu-software;libc/">
 <!ENTITY glibc-tmp-du "818 MB">
 <!ENTITY glibc-tmp-sbu "4.3 SBU">
@@ -394,7 +394,7 @@
 <!ENTITY less-fin-du "4.2 MB">
 <!ENTITY less-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY lfs-bootscripts-version "20220623">      <!-- Scripts depend on this format -->
+<!ENTITY lfs-bootscripts-version "20220723">      <!-- Scripts depend on this format -->
 <!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB">
 <!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.xz">
 <!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM">
@@ -600,19 +600,19 @@
 <!-- If python minor version changes, updates in python and
      meson pages will be needed: python3.6 and python3.6m -->
 
-<!ENTITY python-version "3.10.5">
+<!ENTITY python-version "3.10.6">
 <!ENTITY python-minor "3.10">
-<!ENTITY python-size "18,908 KB">
+<!ENTITY python-size "19,142 KB">
 <!ENTITY python-url "https://www.python.org/ftp/python/&python-version;/Python-&python-version;.tar.xz">
-<!ENTITY python-md5 "f05727cb3489aa93cd57eb561c16747b">
+<!ENTITY python-md5 "afc7e14f7118d10d1ba95ae8e2134bf0">
 <!ENTITY python-home "https://www.python.org/">
 <!ENTITY python-tmp-du "359 MB">
 <!ENTITY python-tmp-sbu "1.2 SBU">
 <!ENTITY python-fin-du "275 MB">
 <!ENTITY python-fin-sbu "4.3 SBU">
 <!ENTITY python-docs-url "https://www.python.org/ftp/python/doc/&python-version;/python-&python-version;-docs-html.tar.bz2">
-<!ENTITY python-docs-md5 "46a8c3285c6ca87736bc9aad2d8519ba">
+<!ENTITY python-docs-md5 "8f32c4f4f0b18ec56e8b3822bbaeb017">
-<!ENTITY python-docs-size "7,112 KB">
+<!ENTITY python-docs-size "7,321 KB">
 
 <!ENTITY readline-version "8.1.2">
 <!ENTITY readline-soversion "8.1"><!-- used for stripping -->
@@ -719,10 +719,10 @@
 <!ENTITY udev-lfs-home    " ">
 
 <!ENTITY util-linux-minor "2.38">
-<!ENTITY util-linux-version "2.38"> <!-- 2.33.x -->
+<!ENTITY util-linux-version "2.38.1"> <!-- 2.33.x -->
-<!ENTITY util-linux-size "7,177 KB">
+<!ENTITY util-linux-size "7,321 KB">
 <!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v&util-linux-minor;/util-linux-&util-linux-version;.tar.xz">
-<!ENTITY util-linux-md5 "fffdc126809a6d4c1789a9efc1b96623">
+<!ENTITY util-linux-md5 "cd11456f4ddd31f7fbfdd9488c0c0d02">
 <!ENTITY util-linux-home "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/">
 <!ENTITY util-linux-tmp-du "129 MB">
 <!ENTITY util-linux-tmp-sbu "0.7 SBU">

patches.ent

@@ -39,11 +39,11 @@
 <!ENTITY file-upstream-fixes-md5 "d99090db596b9db2bed869662199a56a">
 <!ENTITY file-upstream-fixes-patch-size "4.0 KB">
 -->
-<!--
+
-<!ENTITY gcc-upstream-fixes-patch "gcc-&gcc-version;-upstream_fixes-1.patch">
+<!ENTITY gcc-upstream-fixes-patch "gcc-&gcc-version;-glibc_2.36-1.patch">
-<!ENTITY gcc-upstream-fixes-patch-md5 "27266d2a771f2ff812cb6ec9c8b456b4">
+<!ENTITY gcc-upstream-fixes-patch-md5 "8a5a4c3d14b9b2398b32f20b53a4de50">
-<!ENTITY gcc-upstream-fixes-patch-size "18.0 KB">
+<!ENTITY gcc-upstream-fixes-patch-size "1.7 KB">
--->
+
 <!ENTITY glibc-fhs-patch "glibc-&glibc-version;-fhs-1.patch">
 <!ENTITY glibc-fhs-patch-md5 "9a5997c3452909b1769918c759eff8a2">
 <!ENTITY glibc-fhs-patch-size "2.8 KB">
@@ -85,6 +85,10 @@
 <!ENTITY sysvinit-consolidated-patch-md5 "4900322141d493e74020c9cf437b2cdc">
 <!ENTITY sysvinit-consolidated-patch-size "2.4 KB">
 
+<!ENTITY systemd-upstream-patch "systemd-&systemd-version;-glibc_2.36_fix-1.patch">
+<!ENTITY systemd-upstream-patch-md5 "fd8dc901e73ad00dc72a351a0d4ac48c">
+<!ENTITY systemd-upstream-patch-size "3.0 KB">
+
 <!ENTITY xz-upstream-fix-patch "xz-&xz-version;-upstream_fix-1.patch">
 <!ENTITY xz-upstream-fix-patch-md5 "584c72ea3d8f7502b2770670f3090788">
 <!ENTITY xz-upstream-fix-patch-size "3.7 KB">