Changeset df462a9 for chapter04/creatingminlayout.xml

Timestamp:

05/12/2021 05:26:46 AM (3 years ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

ml-11.0, multilib

Children:

3de7f52

Parents:

0e9fb93 (diff), d7a9421 (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 pre-LFS-11-0 changes

File:

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

chapter04/creatingminlayout.xml

@@ -21 +21 @@
   <systemitem class="username">root</systemitem>:</para>
 
-<screen><userinput>mkdir -pv $LFS/{bin,etc,lib,sbin,usr,var}
+<screen><userinput>mkdir -pv $LFS/{etc,var} $LFS/usr/{bin,lib,sbin}
+
+for i in bin lib sbin; do
+  ln -sv usr/$i $LFS/$i
+done
+
 case $(uname -m) in
   x86_64) mkdir -pv $LFS/lib64 ;;
 esac</userinput></screen>
-<screen arch="ml_32"  ><userinput>mkdir -pv $LFS&lib-m32;</userinput></screen>
-<screen arch="ml_x32" ><userinput>mkdir -pv $LFS&lib-mx32;</userinput></screen>
-<screen arch="ml_all" ><userinput>mkdir -pv $LFS/lib{,x}32</userinput></screen>
-<!--
-<screen arch="ml_32"  ><userinput>mkdir -pv $LFS/{usr/,}lib32</userinput></screen>
-<screen arch="ml_x32" ><userinput>mkdir -pv $LFS/{usr/,}libx32</userinput></screen>
-<screen arch="ml_all" ><userinput>mkdir -pv $LFS/{usr/,}{lib32,libx32}</userinput></screen>
-<screen arch="ml_32"  ><userinput>mkdir -pv $LFS&usr-inc-m32;</userinput></screen>
-<screen arch="ml_x32" ><userinput>mkdir -pv $LFS&usr-inc-mx32;</userinput></screen>
-<screen arch="ml_all" ><userinput>mkdir -pv $LFS&usr-inc-m32;
-mkdir -pv $LFS&usr-inc-mx32;</userinput></screen>
--->
+<screen arch="ml_32"><userinput>mkdir -pv $LFS&usr-lib-m32;
+ln -sv usr&lib-m32; $LFS&lib-m32;</userinput></screen>
+<screen arch="ml_x32"><userinput>mkdir -pv $LFS&usr-lib-mx32;
+ln -sv usr&lib-mx32; $LFS&lib-mx32;</userinput></screen>
+<screen arch="ml_all"><userinput>mkdir -pv $LFS/usr/lib{,x}32
+ln -sv usr&lib-m32; $LFS&lib-m32;
+ln -sv usr&lib-mx32; $LFS&lib-mx32;</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