Changeset d7a9421 for chapter04

Timestamp:

05/12/2021 04:24:11 AM (3 years ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

5ed37b3, c034573, df462a9

Parents:

0f7d4cb

Message:

Merge Xi's changes into trunk
Update to meson-0.58.0
Update to systemd-248
Update to gcc-11.1.0
Update to linux-5.12.1
Update to iproute2-5.12.0
Update to Python-3.9.5
Make /bin, /sbin, and /lib symlinks to their counterparts in /usr.
Thanks again for a significant portion of this work goes to Xi, I only
really merged it and made a couple of modifications for my updates. To
LFS 11.x we go!

Location:

chapter04

Files:

• addinguser.xml (modified) (1 diff)
• creatingminlayout.xml (modified) (1 diff)

chapter04/addinguser.xml

@@ -81 +81 @@
   <systemitem class="username">lfs</systemitem> the directory owner:</para>
 
-<screen><userinput>chown -v lfs $LFS/{usr,lib,var,etc,bin,sbin,tools}
+<screen><userinput>chown -v lfs $LFS/{usr{,/*},lib,var,etc,bin,sbin,tools}
 case $(uname -m) in
   x86_64) chown -v lfs $LFS/lib64 ;;

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>
+
+    <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