gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-06-19 03:39:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Automatic merge of trunk into multilib

Browse Source
This commit is contained in:
Thomas Trepl (Moody) 2022-02-19 05:45:14 +01:00
commit 3b70f926ce
9 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
chapter02/hostreqs.xml
View File

@ -29,7 +29,7 @@
</listitem>
<listitem>
<para><emphasis role="strong">Binutils-2.25</emphasis> (Versions
<para><emphasis role="strong">Binutils-2.13.1</emphasis> (Versions
greater than &binutils-version; are not recommended as they have
not been tested)</para>
</listitem>
@ -39,10 +39,6 @@
should be a link to bison or small script that executes bison)</para>
</listitem>
<listitem>
<para><emphasis role="strong">Bzip2-1.0.4</emphasis></para>
</listitem>
<listitem>
<para><emphasis role="strong">Coreutils-6.9</emphasis></para>
</listitem>
@ -60,17 +56,12 @@
should be a link to gawk)</para>
</listitem>
<!-- glibc-2.30 requires gcc-6.2 or later -->
<listitem>
<para><emphasis role="strong">GCC-6.2</emphasis> including the C++
<para><emphasis role="strong">GCC-4.8</emphasis> including the C++
compiler, <command>g++</command> (Versions greater than &gcc-version; are
not recommended as they have not been tested)</para>
</listitem>
<listitem>
<para><emphasis role="strong">Glibc-2.11</emphasis> (Versions
greater than &glibc-version; are not recommended as they have
not been tested)</para>
not recommended as they have not been tested). C and C++ standard
libraries (with headers) must also be present so the C++ compiler can
build hosted programs</para>
</listitem>
<listitem>
@ -180,7 +171,6 @@ else
echo "yacc not found"
fi
bzip2 --version 2&gt;&amp;1 &lt; /dev/null | head -n1 | cut -d" " -f1,6-
echo -n "Coreutils: "; chown --version | head -n1 | cut -d")" -f2
diff --version | head -n1
find --version | head -n1
@ -196,7 +186,6 @@ fi
gcc --version | head -n1
g++ --version | head -n1
ldd --version | head -n1 | cut -d" " -f2- # glibc version
grep --version | head -n1
gzip --version | head -n1
cat /proc/version

9
chapter05/gcc-pass1.xml
View File

@ -140,11 +140,10 @@ cd build</userinput></screen>
<term><parameter>--with-glibc-version=&glibc-version;</parameter></term>
<listitem>
<para>This option specifies the version of glibc which will be
used on the target. It is not relevent to the minimum glibc
requirement specified in the
<xref linkend="ch-partitioning-hostreqs"/> because everything
compiled by pass1 gcc will run in the chroot environment,
which is isolated from glibc of the host distro.</para>
used on the target. It is not relevant to the libc of the host
distro because everything compiled by pass1 gcc will run in the
chroot environment, which is isolated from libc of the host
distro.</para>
</listitem>
</varlistentry>

2
chapter07/cleanup.xml
View File

@ -158,7 +158,7 @@ tar -cJpf $HOME/lfs-temp-tools-&version;.tar.xz .</userinput></screen>
<!-- Make the following look different so users don't blindly run the
restore when they don't need to. -->
<warning><para>The following commands are extremly dangerous. If
<warning><para>The following commands are extremely dangerous. If
you run <command>rm -rf ./*</command> as the root user and you
do not change to the $LFS directory or the <envar>LFS</envar>
environment variable is not set for the root user, it will destroy

3
chapter08/binutils.xml
View File

@ -190,8 +190,9 @@ cd build</userinput></screen>
<para>Test the results:</para>
<screen><userinput remap="test">make -k check</userinput></screen>
<!--
<para>Four tests related to zlib are known to fail.</para>
-->
<!--
<para>Seven gold tests are known to fail with gcc-11.1.0</para>

5
chapter08/shadow.xml
View File

@ -104,6 +104,7 @@ find man -name Makefile.in -exec sed -i 's/passwd\.5 / /' {} \;</userinput></s
<screen><userinput remap="configure">touch /usr/bin/passwd
./configure --sysconfdir=/etc \
--disable-static \
--with-group-name-max-length=32</userinput></screen>
<variablelist>
@ -254,9 +255,7 @@ useradd -D --gid 999</userinput></screen>
sg (link to newgrp), su, useradd, userdel, usermod,
vigr (link to vipw), and vipw</seg>
<seg>/etc/default</seg>
<!-- TODO: the static lib should be disabled by - -disable-static.
Keep it for now because of the rc freeze. -->
<seg>libsubid.{a,so}</seg>
<seg>libsubid.so</seg>
</seglistitem>
</segmentedlist>

2
chapter08/systemd.xml
View File

@ -666,7 +666,7 @@ rm -f /usr/bin/xsltproc</userinput></screen>
<varlistentry id="systemd-creds">
<term><command>systemd-creds</command></term>
<listitem>
<para>Displays and processes credentials.</para>
<para>Displays and processes credentials</para>
<indexterm zone="ch-system-systemd systemd-creds">
<primary sortas="b-systemd-creds">systemd-creds</primary>
</indexterm>

2
chapter09/systemd-custom.xml
View File

@ -123,7 +123,7 @@ cp /usr/lib/tmpfiles.d/tmp.conf /etc/tmpfiles.d</userinput></screen>
<sect2>
<title>Overriding Default Services Behavior</title>
<para>The parameters of a unit can be overriden by creating a directory
<para>The parameters of a unit can be overridden by creating a directory
and a configuration file in <filename
class="directory">/etc/systemd/system</filename>. For example:</para>

2
chapter09/usage.xml
View File

@ -292,7 +292,7 @@ EOF</userinput></screen>
at <ulink url="&hints-root;time.txt"/>. It explains issues such as
time zones, UTC, and the <envar>TZ</envar> environment variable.</para>
<note><para>The CLOCKPARAMS and UTC paramaters may also be set
<note><para>The CLOCKPARAMS and UTC parameters may also be set
in the <filename>/etc/sysconfig/rc.site</filename> file.</para></note>
</sect2>

2
prologue/why.xml
View File

@ -396,7 +396,7 @@
<para>MarkupSafe</para>
<para>This package is a Python module for processing strings in
HTML/XHTML/XML safely. Jinja2 requires this pacakge.</para>
HTML/XHTML/XML safely. Jinja2 requires this package.</para>
</listitem>
<listitem>