Changeset 3b70f92

Timestamp:

02/19/2022 04:45:14 AM (2 years ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

multilib

Children:

f0275e9

Parents:

77ea132 (diff), d6006ef (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Automatic merge of trunk into multilib

Files:

• chapter02/hostreqs.xml (modified) (5 diffs)
• chapter05/gcc-pass1.xml (modified) (1 diff)
• chapter07/cleanup.xml (modified) (1 diff)
• chapter08/binutils.xml (modified) (1 diff)
• chapter08/shadow.xml (modified) (2 diffs)
• chapter08/systemd.xml (modified) (1 diff)
• chapter09/systemd-custom.xml (modified) (1 diff)
• chapter09/usage.xml (modified) (1 diff)
• prologue/why.xml (modified) (1 diff)

chapter02/hostreqs.xml

@@ -30 +30 @@
 
     <listitem>
-      <para><emphasis role="strong">Binutils-2.25</emphasis> (Versions
+      <para><emphasis role="strong">Binutils-2.13.1</emphasis> (Versions
       greater than &binutils-version; are not recommended as they have
       not been tested)</para>
@@ -41 +41 @@
 
     <listitem>
-      <para><emphasis role="strong">Bzip2-1.0.4</emphasis></para>
-    </listitem>
-
-    <listitem>
       <para><emphasis role="strong">Coreutils-6.9</emphasis></para>
     </listitem>
@@ -61 +57 @@
     </listitem>
 
-    <!-- glibc-2.30 requires gcc-6.2 or later -->
-    <listitem>
-      <para><emphasis role="strong">GCC-6.2</emphasis> including the C++
+    <listitem>
+      <para><emphasis role="strong">GCC-4.8</emphasis> including the C++
       compiler, <command>g++</command> (Versions greater than &gcc-version; are
-      not recommended as they have not been tested)</para>
-    </listitem>
-
-    <listitem>
-      <para><emphasis role="strong">Glibc-2.11</emphasis> (Versions
-      greater than &glibc-version; are not recommended as they have
-      not been tested)</para>
+      not recommended as they have not been tested). C and C++ standard
+      libraries (with headers) must also be present so the C++ compiler can
+      build hosted programs</para>
     </listitem>
 
@@ -181 +172 @@
 fi
 
-bzip2 --version 2&gt;&amp;1 &lt; /dev/null | head -n1 | cut -d" " -f1,6-
 echo -n "Coreutils: "; chown --version | head -n1 | cut -d")" -f2
 diff --version | head -n1
@@ -197 +187 @@
 gcc --version | head -n1
 g++ --version | head -n1
-ldd --version | head -n1 | cut -d" " -f2-  # glibc version
 grep --version | head -n1
 gzip --version | head -n1

chapter05/gcc-pass1.xml

@@ -141 +141 @@
         <listitem>
           <para>This option specifies the version of glibc which will be
-          used on the target. It is not relevent to the minimum glibc
-          requirement specified in the
-          <xref linkend="ch-partitioning-hostreqs"/> because everything
-          compiled by pass1 gcc will run in the chroot environment,
-          which is isolated from glibc of the host distro.</para>
+          used on the target. It is not relevant to the libc of the host
+          distro because everything compiled by pass1 gcc will run in the
+          chroot environment, which is isolated from libc of the host
+          distro.</para>
         </listitem>
       </varlistentry>

chapter07/cleanup.xml

@@ -159 +159 @@
      restore when they don't need to. -->
 
-    <warning><para>The following commands are extremly dangerous.  If
+    <warning><para>The following commands are extremely dangerous.  If
     you run <command>rm -rf ./*</command> as the root user and you
     do not change to the $LFS directory or the <envar>LFS</envar>

chapter08/binutils.xml

@@ -191 +191 @@
 
 <screen><userinput remap="test">make -k check</userinput></screen>
-
+<!--
     <para>Four tests related to zlib are known to fail.</para>
+-->
 <!--
     <para>Seven gold tests are known to fail with gcc-11.1.0</para>

chapter08/shadow.xml

@@ -105 +105 @@
 <screen><userinput remap="configure">touch /usr/bin/passwd
 ./configure --sysconfdir=/etc \
+            --disable-static  \
             --with-group-name-max-length=32</userinput></screen>
 
@@ -255 +256 @@
         vigr (link to vipw), and vipw</seg>
         <seg>/etc/default</seg>
-        <!-- TODO: the static lib should be disabled by - -disable-static.
-             Keep it for now because of the rc freeze.  -->
-        <seg>libsubid.{a,so}</seg>
+        <seg>libsubid.so</seg>
       </seglistitem>
     </segmentedlist>

chapter08/systemd.xml

@@ -667 +667 @@
         <term><command>systemd-creds</command></term>
         <listitem>
-          <para>Displays and processes credentials.</para>
+          <para>Displays and processes credentials</para>
           <indexterm zone="ch-system-systemd systemd-creds">
             <primary sortas="b-systemd-creds">systemd-creds</primary>

chapter09/systemd-custom.xml

@@ -124 +124 @@
     <title>Overriding Default Services Behavior</title>
 
-    <para>The parameters of a unit can be overriden by creating a directory
+    <para>The parameters of a unit can be overridden by creating a directory
     and a configuration file in <filename
     class="directory">/etc/systemd/system</filename>. For example:</para>

chapter09/usage.xml

@@ -293 +293 @@
     time zones, UTC, and the <envar>TZ</envar> environment variable.</para>
 
-    <note><para>The CLOCKPARAMS and UTC paramaters may also be set
+    <note><para>The CLOCKPARAMS and UTC parameters may also be set
     in the <filename>/etc/sysconfig/rc.site</filename> file.</para></note>
 

prologue/why.xml

@@ -397 +397 @@
 
         <para>This package is a Python module for processing strings in
-        HTML/XHTML/XML safely.  Jinja2 requires this pacakge.</para>
+        HTML/XHTML/XML safely.  Jinja2 requires this package.</para>
       </listitem>