Automatic merge of trunk into multilib

chapter01/changelog.xml

@@ -39,6 +39,16 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
     -->
+    <listitem>
+      <para>2022-10-17</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to linux-6.0.2 (Security update). Fixes
+          <ulink url="&lfs-ticket-root;5138">#5138</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2022-10-15</para>
       <itemizedlist>

chapter01/how.xml

@@ -15,10 +15,10 @@
   existing Linux system (the host) will be used as a starting point to
   provide necessary programs, including a compiler, linker, and shell,
   to build the new system. Select the <quote>development</quote> option
-  during the distribution installation to be able to access these
+  during the distribution installation to include these
   tools.</para>
 
-  <para>As an alternative to installing a separate distribution onto your
+  <para>As an alternative to installing a separate distribution on your
   machine, you may wish to use <!-- the Linux From Scratch LiveCD or --> a LiveCD from a
   commercial distribution. <!-- The LFS LiveCD works well as a host system,
   providing all the tools you need to successfully follow the instructions in
@@ -36,47 +36,47 @@
   </note> -->
 
   <para><xref linkend="chapter-partitioning"/> of this book describes how
-  to create a new Linux native partition and file system. This is the place
+  to create a new Linux native partition and file system,
   where the new LFS system will be compiled and installed. <xref
   linkend="chapter-getting-materials"/> explains which packages and
-  patches need to be downloaded to build an LFS system and how to store
+  patches must be downloaded to build an LFS system, and how to store
   them on the new file system. <xref linkend="chapter-final-preps"/>
   discusses the setup of an appropriate working environment. Please read
   <xref linkend="chapter-final-preps"/> carefully as it explains several
-  important issues you need be aware of before beginning to
+  important issues you should be aware of before you begin to
   work your way through <xref linkend="chapter-cross-tools"/> and beyond.</para>
 
   <para><xref linkend="chapter-cross-tools"/>  explains the installation of
-  the initial tool chain, (binutils, gcc, and glibc) using cross compilation
+  the initial tool chain, (binutils, gcc, and glibc) using cross-compilation
   techniques to isolate the new tools from the host system.</para>
 
   <para><xref linkend="chapter-temporary-tools"/> shows you how to
   cross-compile basic utilities using the just built cross-toolchain.</para>
 
   <para><xref linkend="chapter-chroot-temporary-tools"/> then enters a
-  "chroot" environment and uses the previously built tools to build
+  "chroot" environment, which uses the new tools to build all
-  the additional tools needed to build and test the final system.</para>
+  the rest of the tools needed to create the LFS system.</para>
 
   <para>This effort to isolate the new system from the host distribution may
   seem excessive. A full technical explanation as to why this is done is
   provided in <xref linkend="ch-tools-toolchaintechnotes"/>.</para>
 
   <para>In <xref linkend="chapter-building-system"/> the
-  full LFS system is built. Another advantage provided by the chroot
+  full-blown LFS system is built. Another advantage provided by the chroot
   environment is that it allows you to continue using the host system
   while LFS is being built. While waiting for package compilations to
-  complete, you can continue using your computer as normal.</para>
+  complete, you can continue using your computer as usual.</para>
 
   <para>To finish the installation, the basic system configuration is set up in
-  <xref linkend="chapter-config"/>, and the kernel and boot loader are set
+  <xref linkend="chapter-config"/>, and the kernel and boot loader are created
-  up in <xref linkend="chapter-bootable"/>. <xref linkend="chapter-finalizing"/>
+  in <xref linkend="chapter-bootable"/>. <xref linkend="chapter-finalizing"/>
   contains information on continuing the LFS experience beyond this book.
-  After the steps in this book have been implemented, the computer will be
+  After the steps in this chapter have been implemented, the computer is
-  ready to reboot into the new LFS system.</para>
+  ready to boot into the new LFS system.</para>
 
   <para>This is the process in a nutshell. Detailed information on each
-  step is discussed in the following chapters and package descriptions.
+  step is presented in the following chapters.
-  Items that may seem complicated will be clarified, and everything will
+  Items that seem complicated now will be clarified, and everything will
-  fall into place as you embark on the LFS adventure.</para>
+  fall into place as you commence your LFS adventure.</para>
 
 </sect1>

chapter01/resources.xml

@@ -15,8 +15,8 @@
 
     <para>If during the building of the LFS system you encounter any
     errors, have any questions, or think there is a typo in the book,
-    please start by consulting the Frequently Asked Questions (FAQ)
+    please start by consulting the list of Frequently Asked Questions (FAQ),
-    that is located at <ulink url="&faq-root;"/>.</para>
+    located at <ulink url="&faq-root;"/>.</para>
 
   </sect2>
 
@@ -25,7 +25,7 @@
 
     <para>The <uri>linuxfromscratch.org</uri> server hosts a number of mailing
     lists used for the development of the LFS project. These lists include the
-    main development and support lists, among others. If the FAQ does not solve
+    main development and support lists, among others. If the FAQ do not solve
     the problem you are having, the next step would be to search the mailing
     lists at <ulink url="&lfs-root;search.html"/>.</para>
 
@@ -53,8 +53,8 @@
   <sect2 id="ch-intro-irc">
     <title>IRC</title>
 
-    <para>Several members of the LFS community offer assistance on Internet
+    <para>Several members of the LFS community offer assistance via Internet
-    Relay Chat (IRC). Before using this support, please make sure that your
+    Relay Chat (IRC). Before using this support, please make sure your
     question is not already answered in the LFS FAQ or the mailing list
     archives. You can find the IRC network at <uri>irc.libera.chat</uri>.
     The support channel is named #lfs-support.</para>

chapter01/whatsnew.xml

@@ -11,16 +11,16 @@
 
   <title>What's new since the last release</title>
 
-  <para>In 11.3 release, <parameter>--enable-default-pie</parameter>
+  <para>In the 11.3 release, <parameter>--enable-default-pie</parameter>
   and <parameter>--enable-default-ssp</parameter> are enabled for GCC.
-  They can mitigate some type of malicious attacks but they cannot provide
+  These techniques can mitigate some malicious attacks, but they do not provide
-  a full protection.  In case if you are reading a programming textbook,
+  perfect security.  If you are reading LFS and a programming textbook,
-  you may need to disable PIE and SSP with GCC options
+  you may need to disable PIE and SSP with the GCC options
-  <parameter>-fno-pie -no-pie -fno-stack-protection</parameter>
+  <parameter>-fno-pie -no-pie -fno-stack-protection</parameter>,
-  because some textbooks assume they were disabled by default.</para>
+  because some textbooks assume these options are disabled by default.</para>
 
-  <para>Below is a list of package updates made since the previous
+  <para>Here is a list of the packages updated since the previous
-  release of the book.</para>
+  release of LFS.</para>
 
   <!--
     Every package in the book is listed in the "Upgraded to:" section.

chapter02/hostreqs.xml

@@ -83,7 +83,7 @@
       udev.</para>
 
       <para>If the host kernel is earlier than &min-kernel; you will need to replace
-      the kernel with a more up to date version. There are two ways
+      the kernel with a more up-to-date version. There are two ways
       you can go about this. First, see if your Linux vendor provides a &min-kernel;
       or later kernel package. If so, you may wish to install it. If your
       vendor doesn't offer an acceptable kernel package, or you would prefer not to
@@ -148,7 +148,7 @@
   <!--<title> </title>-->
 
   <para >To see whether your host system has all the appropriate versions, and
-  the ability to compile programs, run the following:</para>
+  the ability to compile programs, run the following commands:</para>
 
 <screen role="nodump"><userinput>cat &gt; version-check.sh &lt;&lt; "EOF"
 <literal>#!/bin/bash

chapter02/stages.xml

@@ -12,22 +12,22 @@
 
   <para>LFS is designed to be built in one session.  That is, the
   instructions assume that the system will not be shut down
-  during the process.  That does not mean that the system has to
+  during the process.  This does not mean that the system has to
-  be done in one sitting.  The issue is that certain procedures
+  be built in one sitting.  The issue is that certain procedures
-  have to be re-accomplished after a reboot if resuming LFS at
+  must be repeated after a reboot when resuming LFS at
   different points.</para>
 
   <sect2>
   <title>Chapters&nbsp;1&ndash;4</title>
 
-    <para>These chapters are accomplished on the host system.  When
+    <para>These chapters run commands on the host system.  When
-    restarting, be careful of the following:</para>
+    restarting, be certain of one thing:</para>
 
     <itemizedlist>
       <listitem>
-        <para>Procedures done as the
+        <para>Procedures performed as the
         <systemitem class="username">root</systemitem> user after Section
-        2.4 need to have the LFS environment variable set
+        2.4 must have the LFS environment variable set
         <emphasis>FOR THE ROOT USER</emphasis>.</para>
       </listitem>
     </itemizedlist>
@@ -44,7 +44,7 @@
       <listitem>
         <para>These two chapters <emphasis>must</emphasis> be done as user
         <systemitem class="username">lfs</systemitem>.
-        A <command>su - lfs</command> command must be issued before any task in these
+        A <command>su - lfs</command> command must be issued before performing any task in these
         chapters. If you don't do that, you are at risk of installing packages to the
         host, and potentially rendering it unusable.</para>
       </listitem>
@@ -52,8 +52,8 @@
       <listitem>
          <para>The procedures in <xref linkend='ch-tools-generalinstructions'/>
          are critical.  If there is any
-         doubt about installing a package, ensure any previously expanded
+         doubt a package has been installed correctly, ensure the previously expanded
-         tarballs are removed, then re-extract the package files, and complete all
+         tarball has been removed, then re-extract the package, and complete all
          the instructions in that section.</para>
       </listitem>
     </itemizedlist>
@@ -77,7 +77,7 @@
       <listitem>
          <para> When entering chroot, the LFS environment variable must be set
          for <systemitem class="username">root</systemitem>. The LFS
-         variable is not used after entering the chroot environment.</para>
+         variable is not used after the chroot environment has been entered.</para>
       </listitem>
 
       <listitem>

packages.ent

@@ -433,12 +433,12 @@
 
 <!ENTITY linux-major-version "6">
 <!ENTITY linux-minor-version "0">
-<!ENTITY linux-patch-version "1">
+<!ENTITY linux-patch-version "2">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "130,737 KB">
+<!ENTITY linux-size "130,712 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "514d7aafe8964474b14f8fe6c69e6895">
+<!ENTITY linux-md5 "5a7ea40f0ec23b0800e8b52cb44ed04c">
 <!ENTITY linux-home "https://www.kernel.org/">
 <!-- measured for 5.13.4 / gcc-11.1.0 on x86_64 : minimum is
  allnoconfig rounded down to allow for ongoing cleanups,