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-06-26 20:37:06 +02:00
commit dcb4788f99
6 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
appendices/dependencies.xml
View File

@ -244,7 +244,7 @@
<segmentedlist id="bc-depends">
<segtitle>&dependencies;</segtitle>
<seglistitem>
<seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, and Make</seg>
<seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, and Readline</seg>
</seglistitem>
</segmentedlist>
@ -2615,7 +2615,7 @@
<segmentedlist id="readline-before">
<segtitle>&before;</segtitle>
<seglistitem>
<seg>Bash and Gawk</seg>
<seg>Bash, Bc, and Gawk</seg>
</seglistitem>
</segmentedlist>

2
bootscripts/lfs/init.d/cleanfs
View File

@ -105,7 +105,7 @@ case "${1}" in
(exit ${failed})
evaluate_retval
if egrep -qv '^(#|$)' /etc/sysconfig/createfiles 2>/dev/null; then
if grep -E -qv '^(#|$)' /etc/sysconfig/createfiles 2>/dev/null; then
log_info_msg "Creating files and directories... "
create_files # Always returns 0
evaluate_retval

2
bootscripts/lfs/init.d/modules
View File

@ -35,7 +35,7 @@ case "${1}" in
# Exit if there's no modules file or there are no
# valid entries
[ -r /etc/sysconfig/modules ] || exit 0
egrep -qv '^($|#)' /etc/sysconfig/modules || exit 0
grep -E -qv '^($|#)' /etc/sysconfig/modules || exit 0
log_info_msg "Loading modules:"

16
chapter08/bc.xml
View File

@ -43,7 +43,7 @@
<para>Prepare Bc for compilation:</para>
<screen><userinput remap="configure">CC=gcc ./configure --prefix=/usr -G -O3</userinput></screen>
<screen><userinput remap="configure">CC=gcc ./configure --prefix=/usr -G -O3 -r</userinput></screen>
<variablelist>
<title>The meaning of the configure options:</title>
@ -55,6 +55,14 @@
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>-G</parameter></term>
<listitem>
<para>Omit parts of the test suite that won't work
without a GNU bc present.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>-O3</parameter></term>
<listitem>
@ -63,10 +71,10 @@
</varlistentry>
<varlistentry>
<term><parameter>-G</parameter></term>
<term><parameter>-r</parameter></term>
<listitem>
<para>Omit parts of the test suite that won't work
without a GNU bc present.</para>
<para>Enable the use of <application>Readline</application> to
improve the line editing feature of bc.</para>
</listitem>
</varlistentry>
</variablelist>

6
chapter08/grep.xml
View File

@ -77,7 +77,8 @@
<varlistentry id="egrep">
<term><command>egrep</command></term>
<listitem>
<para>Prints lines matching an extended regular expression</para>
<para>Prints lines matching an extended regular expression.
It is obsoleted, use <command>grep -E</command> instead</para>
<indexterm zone="ch-system-grep egrep">
<primary sortas="b-egrep">egrep</primary>
</indexterm>
@ -87,7 +88,8 @@
<varlistentry id="fgrep">
<term><command>fgrep</command></term>
<listitem>
<para>Prints lines matching a list of fixed strings</para>
<para>Prints lines matching a list of fixed strings.
It is obsoleted, use <command>grep -F</command> instead</para>
<indexterm zone="ch-system-grep fgrep">
<primary sortas="b-fgrep">fgrep</primary>
</indexterm>

7
chapter08/openssl.xml
View File

@ -201,8 +201,11 @@ rm -rf DESTDIR</userinput></screen>
<term><command>c_rehash</command></term>
<listitem>
<para>
is a <application>Perl</application> script that scans all files in
a directory and adds symbolic links to their hash values
is a <application>Perl</application> script that
scans all files in a directory and adds symbolic links to their
hash values. Use of <command>c_rehash</command> is considered
obsolete and should be replaced by
<command>openssl rehash</command> command
</para>
<indexterm zone="ch-system-openssl c_rehash">
<primary sortas="b-c_rehash">c_rehash</primary>