Changeset a9fea2f

Timestamp:

11/12/2021 04:45:09 AM (23 months ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

multilib

Children:

f3fa143

Parents:

384c707 (diff), 0fc1b27 (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:

• chapter04/creatingminlayout.xml (modified) (1 diff)
• chapter05/glibc.xml (modified) (1 diff)

chapter04/creatingminlayout.xml

@@ -38 +38 @@
 ln -sv usr/libx32 $LFS/libx32</userinput></screen>
 
-    <note>
-      <para>
-        The above command is correct.  The <command>ln</command> command has
-        a few syntactic versions, so be sure to check
-                <command>info coreutils ln</command> and <filename>ln(1)</filename>
-                before reporting what you may think is an error.
-          </para>
-    </note>
-
   <para>Programs in <xref linkend="chapter-temporary-tools"/> will be compiled
   with a cross-compiler (more details in section <xref

chapter05/glibc.xml

@@ -58 +58 @@
 <screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">ln -sfv ../lib/ld-linux-x86-64.so.2 $LFS/lib64
 ln -sfv ../lib/ld-linux-x86-64.so.2 $LFS/lib64/ld-lsb-x86-64.so.3</userinput></screen>
+
+    <note>
+      <para>
+        The above command is correct.  The <command>ln</command> command has
+        a few syntactic versions, so be sure to check
+        <command>info coreutils ln</command> and <filename>ln(1)</filename>
+        before reporting what you may think is an error.
+      </para>
+    </note>
 
     <para>Some of the Glibc programs use the non-FHS compliant