Changeset d7a9421 for chapter07

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:

chapter07

Files:

• chroot.xml (modified) (1 diff)
• createfiles.xml (modified) (2 diffs)
• creatingdirs.xml (modified) (1 diff)
• util-linux.xml (modified) (2 diffs)

chapter07/chroot.xml

@@ -23 +23 @@
     TERM="$TERM"                \
     PS1='(lfs chroot) \u:\w\$ ' \
-    PATH=/bin:/usr/bin:/sbin:/usr/sbin \
+    PATH=/usr/bin:/usr/sbin     \
     /bin/bash --login +h</userinput></screen>
 

chapter07/createfiles.xml

@@ -84 +84 @@
 systemd-coredump:x:79:79:systemd Core Dumper:/:/bin/false
 uuidd:x:80:80:UUID Generation Daemon User:/dev/null:/bin/false
+systemd-oomd:x:81:81:systemd Out Of Memory Daemon:/:/bin/false
 nobody:x:99:99:Unprivileged User:/dev/null:/bin/false</literal>
 EOF</userinput></screen>
@@ -153 +154 @@
 systemd-coredump:x:79:
 uuidd:x:80:
+systemd-oomd:x:81:81:
 wheel:x:97:
 nogroup:x:99:

chapter07/creatingdirs.xml

@@ -28 +28 @@
 mkdir -pv /lib/firmware
 mkdir -pv /media/{floppy,cdrom}
-mkdir -pv /usr/{,local/}{bin,include,lib,sbin,src}
+mkdir -pv /usr/{,local/}{include,src}
+mkdir -pv /usr/local/{bin,lib,sbin}
 mkdir -pv /usr/{,local/}share/{color,dict,doc,info,locale,man}
 mkdir -pv /usr/{,local/}share/{misc,terminfo,zoneinfo}

chapter07/util-linux.xml

@@ -53 +53 @@
 
 <screen><userinput remap="configure">./configure ADJTIME_PATH=/var/lib/hwclock/adjtime    \
+            --libdir=/usr/lib    \
             --docdir=/usr/share/doc/util-linux-&util-linux-version; \
             --disable-chfn-chsh  \
@@ -76 +77 @@
           at another location, which would not be overwritten or removed
           when building the final util-linux package.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--libdir=/usr/lib</parameter></term>
+        <listitem>
+          <para>This switch ensures the
+          <filename class="extension">.so</filename> symlinks targeting
+          the shared library file in the same directory
+          (<filename class="directory">/usr/lib</filename>) directly.</para>
         </listitem>
       </varlistentry>