Changeset 85d9695a

Timestamp:

08/13/2021 04:33:25 AM (3 years ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

ml-11.0, multilib

Children:

9b90ad1

Parents:

8024387 (diff), 8a269ec (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 trunk

Files:

• chapter07/chapter07.xml (modified) (1 diff)
• chapter07/cleanup.xml (added)
• chapter07/stripping.xml (deleted)
• chapter08/chapter08.xml (modified) (1 diff)
• chapter08/revisedchroot.xml (modified) (1 diff)
• chapter08/stripping.xml (moved) (moved from chapter08/strippingagain.xml ) (4 diffs)

chapter07/chapter07.xml

@@ -32 +32 @@
 -->
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="stripping.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cleanup.xml"/>
 
 </chapter>

chapter08/chapter08.xml

@@ -106 +106 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutdebug.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="strippingagain.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="stripping.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="revisedchroot.xml"/>
 

chapter08/revisedchroot.xml

@@ -58 +58 @@
 <screen><userinput>find /usr -depth -name $(uname -m)-lfs-linux-gnu\* | xargs rm -rf</userinput></screen>
 
-   <para>The <filename class="directory">/tools</filename> directory can also
-   be removed to further gain some space:</para>
-
-<screen><userinput>rm -rf /tools</userinput></screen>
-
    <para>Finally, remove the temporary 'tester' user account created at the 
    beginning of the previous chapter.</para>

chapter08/stripping.xml

@@ -6 +6 @@
 ]>
 
-<sect1 id="ch-system-strippingagain">
-  <?dbhtml filename="strippingagain.html"?>
+<sect1 id="ch-system-stripping">
+  <?dbhtml filename="stripping.html"?>
 
-  <title>Stripping Again</title>
+  <title>Stripping</title>
 
   <para>This section is optional.  If the intended user is not a 
@@ -32 +32 @@
 
   <para>Note that <command>strip</command> will overwrite the binary or library
-  file it is processing.  This may crash the processes using code or data from
+  file it is processing.  This can crash the processes using code or data from
   the file.  If the process running <command>strip</command> itself is
-  affected, the binary or library being stripped may be destroyed.  This may
+  affected, the binary or library being stripped can be destroyed and can
   make the system completely unusable.  To avoid it, we'll copy some libraries
   and binaries into <filename class="directory">/tmp</filename>, strip them
@@ -44 +44 @@
   and ld-linux.so.2 on 32-bit systems.  The contruct below selects the 
   correct name for the current architecture.</para></note>
-
 
 <!-- also of interest are libgfortan, libgo, libgomp, and libobjc from GCC -->
@@ -153 +152 @@
 
   <para>A large number of files will be reported as having their file
-  format not recognized. These warnings can be safely ignored. These
-  warnings indicate that those files are scripts instead of
-  binaries.</para>
+  format not recognized. These warnings can be safely ignored. They
+  indicate that those files are scripts instead of binaries.</para>
 
 </sect1>