diff options
| author | Douglas R. Reno <renodr@linuxfromscratch.org> | 2021-05-11 23:24:11 -0500 |
|---|---|---|
| committer | Douglas R. Reno <renodr@linuxfromscratch.org> | 2021-05-11 23:24:11 -0500 |
| commit | d7a942197e713339d4dc1eedab4dafd4179a5cd8 (patch) | |
| tree | 48aba90323070adb9a54e83ce1ebed902d0b19c3 /chapter07 | |
| parent | 0f7d4cb8a734227ea85f46c5b934ed1b85a51b3c (diff) | |
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!
Diffstat (limited to 'chapter07')
| -rw-r--r-- | chapter07/chroot.xml | 2 | ||||
| -rw-r--r-- | chapter07/createfiles.xml | 2 | ||||
| -rw-r--r-- | chapter07/creatingdirs.xml | 3 | ||||
| -rw-r--r-- | chapter07/util-linux.xml | 11 |
4 files changed, 16 insertions, 2 deletions
diff --git a/chapter07/chroot.xml b/chapter07/chroot.xml index 7f85a73e8..d018cb218 100644 --- a/chapter07/chroot.xml +++ b/chapter07/chroot.xml @@ -22,7 +22,7 @@ HOME=/root \ 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> <para>The <parameter>-i</parameter> option given to the <command>env</command> diff --git a/chapter07/createfiles.xml b/chapter07/createfiles.xml index 8aec64958..1e6b2df9f 100644 --- a/chapter07/createfiles.xml +++ b/chapter07/createfiles.xml @@ -83,6 +83,7 @@ systemd-resolve:x:77:77:systemd Resolver:/:/bin/false systemd-timesync:x:78:78:systemd Time Synchronization:/:/bin/false 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> @@ -152,6 +153,7 @@ systemd-resolve:x:77: systemd-timesync:x:78: systemd-coredump:x:79: uuidd:x:80: +systemd-oomd:x:81:81: wheel:x:97: nogroup:x:99: users:x:999:</literal> diff --git a/chapter07/creatingdirs.xml b/chapter07/creatingdirs.xml index 28ef34a3f..a1dafc1ee 100644 --- a/chapter07/creatingdirs.xml +++ b/chapter07/creatingdirs.xml @@ -27,7 +27,8 @@ <screen><userinput>mkdir -pv /etc/{opt,sysconfig} 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} mkdir -pv /usr/{,local/}share/man/man{1..8} diff --git a/chapter07/util-linux.xml b/chapter07/util-linux.xml index 2c81aaece..8295d0d8e 100644 --- a/chapter07/util-linux.xml +++ b/chapter07/util-linux.xml @@ -52,6 +52,7 @@ <para>Prepare Util-linux for compilation:</para> <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 \ --disable-login \ @@ -79,6 +80,16 @@ </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> + + <varlistentry> <term><parameter>--disable-*</parameter></term> <listitem> <para>These switches prevent warnings about building components |