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 /chapter04 | |
| 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 'chapter04')
| -rw-r--r-- | chapter04/addinguser.xml | 2 | ||||
| -rw-r--r-- | chapter04/creatingminlayout.xml | 16 |
2 files changed, 16 insertions, 2 deletions
diff --git a/chapter04/addinguser.xml b/chapter04/addinguser.xml index 6a163f46b..59fca9468 100644 --- a/chapter04/addinguser.xml +++ b/chapter04/addinguser.xml @@ -80,7 +80,7 @@ useradd -s /bin/bash -g lfs -m -k /dev/null lfs</userinput></screen> all directories under <filename class="directory">$LFS</filename> by making <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 ;; esac</userinput></screen> diff --git a/chapter04/creatingminlayout.xml b/chapter04/creatingminlayout.xml index 749ce84fa..50c431324 100644 --- a/chapter04/creatingminlayout.xml +++ b/chapter04/creatingminlayout.xml @@ -20,11 +20,25 @@ <para>Create the required directory layout by running the following as <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 with a cross-compiler (more details in section <xref linkend="ch-tools-toolchaintechnotes"/>). In order to separate this |