Changeset 588c7a0

Timestamp:

05/11/2022 07:22:07 AM (2 years ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

multilib

Children:

3c2b819

Parents:

3a72ffa (diff), 59d5489 (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:

Merge upstream

Files:

• chapter01/changelog.xml (modified) (1 diff)
• chapter08/procps.xml (modified) (1 diff)
• chapter09/introduction.xml (modified) (1 diff)
• chapter09/usage.xml (modified) (1 diff)
• chapter10/kernel.xml (modified) (3 diffs)

chapter01/changelog.xml

@@ -55 +55 @@
       <itemizedlist>
         <listitem>
-           <para>[bdubbs] - Change nobody/nogroup uid/git to 65534. </para>
+          <para>[bdubbs] - Change nobody/nogroup uid/gid to 65534. </para>
         </listitem>
         <listitem>

chapter08/procps.xml

@@ -90 +90 @@
          which is the total commited virtual memory space of all processes.
          I'll make a report to upstream anyway.  -->
-    <para>One test named <filename>FAIL: free with commit</filename>
+    <para>One test named <filename>free with commit</filename>
     may fail if some applications with a custom memory allocator (for
     example, JVM and Web browsers) are running on the host distro.</para>

chapter09/introduction.xml

@@ -32 +32 @@
     <para>The <command>init</command> program is controlled by the
     <filename>/etc/inittab</filename> file and is organized into run levels that
-    can be run by the user:</para>
+    can be run by the user. In LFS, they are used as follows:</para>
 
 <literallayout>0 &mdash; halt
 1 &mdash; Single user mode
-2 &mdash; Multiuser, without networking
+2 &mdash; User definable
 3 &mdash; Full multiuser mode
 4 &mdash; User definable

chapter09/usage.xml

@@ -32 +32 @@
     each one of those corresponds to the actions the computer is supposed to
     perform when it starts up. The default run-level is 3. Here are the
-    descriptions of the different run-levels as they are implemented:</para>
+    descriptions of the different run-levels as they are implemented in LFS:</para>
 
 <literallayout>0: halt the computer

chapter10/kernel.xml

@@ -107 +107 @@
 
       <screen role="nodump" revision="sysv">General setup -->
+   [ ] Compile the kernel with warnings as errors [CONFIG_WERROR]
    &lt; &gt; Enable kernel headers through /sys/kernel/kheaders.tar.xz [CONFIG_IKHEADERS]
 Device Drivers  ---&gt;
@@ -118 +119 @@
 
       <screen role="nodump" revision="systemd">General setup -->
+   [ ] Compile the kernel with warnings as errors [CONFIG_WERROR]
    [ ] Auditing Support [CONFIG_AUDIT]
    CPU/Task time and stats accounting ---&gt;
@@ -207 +209 @@
         <term>
           <parameter>
+            Compile the kernel with warnings as errors
+          </parameter>
+        </term>
+        <listitem>
+          <para>This may cause building failure if the compiler and/or
+          configuration are different from those of the kernel
+          developers.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <parameter>
             Enable kernel headers through /sys/kernel/kheaders.tar.xz
           </parameter>