gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-03-13 02:49:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Automatic merge of trunk into multilib

Browse Source
This commit is contained in:
Thomas Trepl 2022-12-16 00:30:12 +01:00
commit 6ece6ecc90
9 changed files with 124 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
chapter01/changelog.xml
View File

@ -39,6 +39,53 @@
<listitem revision="sysv"> or <listitem revision="systemd"> as
appropriate for the entry or if needed the entire day's listitem.
-->
<listitem>
<para>2022-12-15</para>
<itemizedlist>
<listitem>
<para>[bdubbs] - Ensure a gawk hard link is updated in
Chapter 8. Fixes
<ulink url="&lfs-ticket-root;5180">#5180</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to iana-etc-20221209. Addresses
<ulink url="&lfs-ticket-root;5006">#5006</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to vim-9.0.1060. Addresses
<ulink url="&lfs-ticket-root;5006">#5006</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to iproute2-6.1.0. Fixes
<ulink url="&lfs-ticket-root;5184">#5184</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to xz-5.4.0. Fixes
<ulink url="&lfs-ticket-root;5183">#5183</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to bash-5.2.15. Fixes
<ulink url="&lfs-ticket-root;5182">#5182</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to psmisc-23.6. Fixes
<ulink url="&lfs-ticket-root;5181">#5181</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to mpc-1.3.0. Fixes
<ulink url="&lfs-ticket-root;5178">#5178</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to python3-3.11.1. Fixes
<ulink url="&lfs-ticket-root;5177">#5177</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to procps-ng-4.0.2. Fixes
<ulink url="&lfs-ticket-root;5176">#5176</ulink>.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>2022-12-01</para>
<itemizedlist>

8
chapter01/whatsnew.xml
View File

@ -193,9 +193,9 @@
<listitem>
<para>Meson-&meson-version;</para>
</listitem>
<!--<listitem>
<listitem>
<para>MPC-&mpc-version;</para>
</listitem>-->
</listitem>
<!--<listitem>
<para>MPFR-&mpfr-version;</para>
</listitem>-->
@ -220,9 +220,9 @@
<listitem>
<para>Procps-ng-&procps-ng-version;</para>
</listitem>
<!--<listitem>
<listitem>
<para>Psmisc-&psmisc-version;</para>
</listitem>-->
</listitem>
<listitem>
<para>Python-&python-version;</para>
</listitem>

8
chapter08/bash.xml
View File

@ -42,10 +42,10 @@
<para>Prepare Bash for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr \
--docdir=/usr/share/doc/bash-&bash-version; \
--without-bash-malloc \
--with-installed-readline</userinput></screen>
<screen><userinput remap="configure">./configure --prefix=/usr \
--without-bash-malloc \
--with-installed-readline \
--docdir=/usr/share/doc/bash-&bash-version;</userinput></screen>
<variablelist>
<title>The meaning of the new configure option:</title>

16
chapter08/gawk.xml
View File

@ -58,7 +58,19 @@
<para>Install the package:</para>
<screen><userinput remap="install">make install</userinput></screen>
<screen><userinput remap="install">make LN='ln -f' install</userinput></screen>
<variablelist>
<title>The meaning of the make environment variable:</title>
<varlistentry>
<term><envar>LN='ln -f'</envar></term>
<listitem>
<para>This variable ensures that the previous hard link installed
in <xref linkend='ch-tools-gawk'/> is updated here.</para>
</listitem>
</varlistentry>
</variablelist>
<para>If desired, install the documentation:</para>
@ -76,7 +88,7 @@ cp -v doc/{awkforai.txt,*.{eps,pdf,jpg}} /usr/share/doc/gawk-&gawk-version;</
<segtitle>Installed directories</segtitle>
<seglistitem>
<seg>awk (link to gawk), gawk, and awk-&gawk-version;</seg>
<seg>awk (link to gawk), gawk, and gawk-&gawk-version;</seg>
<seg>filefuncs.so, fnmatch.so, fork.so, inplace.so, intdiv.so, ordchr.so,
readdir.so, readfile.so, revoutput.so, revtwoway.so, rwarray.so,
and time.so (all in /usr/lib/gawk)</seg>

2
chapter08/man-db.xml
View File

@ -77,7 +77,7 @@
<varlistentry>
<term><parameter>--enable-cache-owner=bin</parameter></term>
<listitem>
<para>This makes the system-wide cache files be owned by user
<para>This changes ownership of the system-wide cache files to user
<systemitem class="username">bin</systemitem>.</para>
</listitem>
</varlistentry>

12
chapter08/mpc.xml
View File

@ -42,6 +42,18 @@
<sect2 role="installation">
<title>Installation of MPC</title>
<para>First, make a fix identified upstream:</para>
<screen><userinput remap="pre">sed -i '273{ h; d; }; 274,286 { H; d; }; 287 G' src/mpc.h</userinput></screen>
<note>
<para>This sed is a little complex and needs some explanation. It holds
the line 273 in a buffer, adds lines 274-286 to it. It then writes the
buffer out after line 287 is read. The result is that the line 287 is
moved upwards from an incorrect location to its correct location in an
#ifdef block.</para>
</note>
<para>Prepare MPC for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr \

9
chapter08/procps.xml
View File

@ -40,7 +40,7 @@
<sect2 role="installation">
<title>Installation of Procps-ng</title>
<para>Prepare procps-ng for compilation:</para>
<para>Prepare Procps-ng for compilation:</para>
<screen revision="sysv"><userinput remap="configure">./configure --prefix=/usr \
--docdir=/usr/share/doc/procps-ng-&procps-ng-version; \
@ -60,7 +60,7 @@
<term><parameter>--disable-kill</parameter></term>
<listitem>
<para>This switch disables building the <command>kill</command>
command that will be installed by the Util-linux package.</para>
command; it will be installed from the Util-linux package.</para>
</listitem>
</varlistentry>
</variablelist>
@ -181,7 +181,7 @@ make check</userinput></screen>
</listitem>
</varlistentry>
<varlistentry id="pwait">
<!-- <varlistentry id="pwait">
<term><command>pwait</command></term>
<listitem>
<para>Waits for a process to finish before executing.</para>
@ -189,7 +189,8 @@ make check</userinput></screen>
<primary sortas="b-pwait">pwait</primary>
</indexterm>
</listitem>
</varlistentry>
</varlistentry> This program no longer exists;
it's already been removed from the Installed programs list. -->
<varlistentry id="pwdx">
<term><command>pwdx</command></term>

19
chapter08/vim.xml
View File

@ -54,7 +54,7 @@
<screen><userinput remap="pre">echo '#define SYS_VIMRC_FILE "/etc/vimrc"' &gt;&gt; src/feature.h</userinput></screen>
<para>Prepare vim for compilation:</para>
<para>Prepare Vim for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
@ -83,7 +83,7 @@
<screen><userinput remap="install">make install</userinput></screen>
<para>Many users are used to using <command>vi</command> instead of
<para>Many users reflexively type <command>vi</command> instead of
<command>vim</command>. To allow execution of <command>vim</command>
when users habitually enter <command>vi</command>, create a
symlink for both the binary and the man page in the provided
@ -94,7 +94,7 @@ for L in /usr/share/man/{,*/}man1/vim.1; do
ln -sv vim.1 $(dirname $L)/vi.1
done</userinput></screen>
<para>By default, vim's documentation is installed in <filename
<para>By default, Vim's documentation is installed in <filename
class="directory">/usr/share/vim</filename>. The following symlink
allows the documentation to be accessed via <filename
class="directory">/usr/share/doc/vim-&vim-version;</filename>, making
@ -103,10 +103,10 @@ done</userinput></screen>
<screen><userinput remap="install">ln -sv ../&vim-docdir;/doc /usr/share/doc/vim-&vim-version;</userinput></screen>
<para>If an X Window System is going to be installed on the LFS
system, it may be necessary to recompile vim after installing X. Vim
system, it may be necessary to recompile Vim after installing X. Vim
comes with a GUI version of the editor that requires X and some
additional libraries to be installed. For more information on this
process, refer to the vim documentation and the vim installation page
process, refer to the Vim documentation and the Vim installation page
in the BLFS book at <ulink
url="&blfs-book;postlfs/vim.html"/>.</para>
@ -166,8 +166,8 @@ EOF</userinput></screen>
<screen role="nodump"><userinput>vim -c ':options'</userinput></screen>
<note>
<para>By default, vim only installs spell files for the English language.
To install spell files for your preferred language, copy the
<para>By default, vim only installs spell-checking files for the English language.
To install spell-checking files for your preferred language, copy the
<filename class='extension'>.spl</filename> and optionally, the
<filename class='extension'>.sug</filename> files for your language
and character encoding from
@ -175,7 +175,7 @@ EOF</userinput></screen>
<filename class='directory'>
/usr/share/&vim-docdir;/spell/</filename>.</para>
<para>To use these spell files, some configuration in
<para>To use these spell-checking files, some configuration in
<filename>/etc/vimrc</filename> is needed, e.g.:</para>
<screen><literal>set spelllang=en,ru
@ -297,7 +297,8 @@ set spell</literal></screen>
<term><command>xxd</command></term>
<listitem>
<para>Creates a hex dump of the given file; it can
also do the reverse, so it can be used for binary patching</para>
also perform the inverse operation, so it can be used for binary
patching</para>
<indexterm zone="ch-system-vim xxd">
<primary sortas="b-xxd">xxd</primary>
</indexterm>

54
packages.ent
View File

@ -48,10 +48,10 @@
<!ENTITY automake-fin-du "116 MB">
<!ENTITY automake-fin-sbu "less than 0.1 SBU (about 7.7 SBU with tests)">
<!ENTITY bash-version "5.2.9">
<!ENTITY bash-version "5.2.15">
<!ENTITY bash-size "10,695 KB">
<!ENTITY bash-url "&gnu;bash/bash-&bash-version;.tar.gz">
<!ENTITY bash-md5 "0d8a4e4fe2d31ed5c304316bd9fcb337">
<!ENTITY bash-md5 "4281bb43497f3905a308430a8d6a30a5">
<!ENTITY bash-home "&gnu-software;bash/">
<!ENTITY bash-tmp-du "64 MB">
<!ENTITY bash-tmp-sbu "0.5 SBU">
@ -317,10 +317,10 @@
<!ENTITY gzip-fin-du "21 MB">
<!ENTITY gzip-fin-sbu "0.3 SBU">
<!ENTITY iana-etc-version "20221122">
<!ENTITY iana-etc-version "20221209">
<!ENTITY iana-etc-size "585 KB">
<!ENTITY iana-etc-url "https://github.com/Mic92/iana-etc/releases/download/&iana-etc-version;/iana-etc-&iana-etc-version;.tar.gz">
<!ENTITY iana-etc-md5 "2d4ea18372691d8c6ffd009a766e3380">
<!ENTITY iana-etc-md5 "b5e3e7ee1f65edff9284e614000a3815">
<!ENTITY iana-etc-home "https://www.iana.org/protocols">
<!ENTITY iana-etc-fin-du "4.8 MB">
<!ENTITY iana-etc-fin-sbu "less than 0.1 SBU">
@ -342,10 +342,10 @@
<!ENTITY intltool-fin-du "1.5 MB">
<!ENTITY intltool-fin-sbu "less than 0.1 SBU">
<!ENTITY iproute2-version "6.0.0">
<!ENTITY iproute2-size "880 KB">
<!ENTITY iproute2-version "6.1.0">
<!ENTITY iproute2-size "885 KB">
<!ENTITY iproute2-url "&kernel;linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz">
<!ENTITY iproute2-md5 "5da6cb3154ee09b9a8b4004d1c2df4cd">
<!ENTITY iproute2-md5 "f3ff4461e25dbc5ef1fb7a9167a9523d">
<!ENTITY iproute2-home "&kernel;linux/utils/net/iproute2/">
<!ENTITY iproute2-fin-du "16 MB">
<!ENTITY iproute2-fin-sbu "0.2 SBU">
@ -504,10 +504,10 @@
<!ENTITY meson-fin-du "38 MB">
<!ENTITY meson-fin-sbu "less than 0.1 SBU">
<!ENTITY mpc-version "1.2.1">
<!ENTITY mpc-size "820 KB">
<!ENTITY mpc-version "1.3.0">
<!ENTITY mpc-size "756 KB">
<!ENTITY mpc-url "https://ftp.gnu.org/gnu/mpc/mpc-&mpc-version;.tar.gz">
<!ENTITY mpc-md5 "9f16c976c25bb0f76b50be749cd7a3a8">
<!ENTITY mpc-md5 "b0f5e2ad6009781777ed026bcf71bf0e">
<!ENTITY mpc-home "https://www.multiprecision.org/">
<!ENTITY mpc-fin-du "21 MB">
<!ENTITY mpc-fin-sbu "0.3 SBU">
@ -578,18 +578,18 @@
<!ENTITY pkgconfig-fin-du "29 MB">
<!ENTITY pkgconfig-fin-sbu "0.3 SBU">
<!ENTITY procps-ng-version "4.0.1">
<!ENTITY procps-ng-size "1089 KB">
<!ENTITY procps-ng-version "4.0.2">
<!ENTITY procps-ng-size "1250 KB">
<!ENTITY procps-ng-url "https://sourceforge.net/projects/procps-ng/files/Production/procps-ng-&procps-ng-version;.tar.xz">
<!ENTITY procps-ng-md5 "5de27fd569843e88a21aa0af8990f96d">
<!ENTITY procps-ng-md5 "691748c4767f19b9d94ed9d088e40c4d">
<!ENTITY procps-ng-home "https://sourceforge.net/projects/procps-ng">
<!ENTITY procps-ng-fin-du "19 MB">
<!ENTITY procps-ng-fin-sbu "0.1 SBU">
<!ENTITY psmisc-version "23.5">
<!ENTITY psmisc-size "395 KB">
<!ENTITY psmisc-version "23.6">
<!ENTITY psmisc-size "415 KB">
<!ENTITY psmisc-url "https://sourceforge.net/projects/psmisc/files/psmisc/psmisc-&psmisc-version;.tar.xz">
<!ENTITY psmisc-md5 "014f0b5d5ab32478a2c57812ad01e1fb">
<!ENTITY psmisc-md5 "ed3206da1184ce9e82d607dc56c52633">
<!ENTITY psmisc-home "https://gitlab.com/psmisc/psmisc">
<!ENTITY psmisc-fin-du "5.8 MB">
<!ENTITY psmisc-fin-sbu "less than 0.1 SBU">
@ -597,19 +597,19 @@
<!-- If python minor version changes, updates in python and
meson pages will be needed: python3.6 and python3.6m -->
<!ENTITY python-version "3.11.0">
<!ENTITY python-version "3.11.1">
<!ENTITY python-minor "3.11">
<!ENTITY python-size "19,356 KB">
<!ENTITY python-size "19,392 KB">
<!ENTITY python-url "https://www.python.org/ftp/python/&python-version;/Python-&python-version;.tar.xz">
<!ENTITY python-md5 "fe92acfa0db9b9f5044958edb451d463">
<!ENTITY python-md5 "4efe92adf28875c77d3b9b2e8d3bc44a">
<!ENTITY python-home "https://www.python.org/">
<!ENTITY python-tmp-du "364 MB">
<!ENTITY python-tmp-sbu "0.9 SBU">
<!ENTITY python-fin-du "283 MB">
<!ENTITY python-fin-sbu "3.4 SBU">
<!ENTITY python-docs-url "https://www.python.org/ftp/python/doc/&python-version;/python-&python-version;-docs-html.tar.bz2">
<!ENTITY python-docs-md5 "b740495c9f6714e0998894ed8d1cb379">
<!ENTITY python-docs-size "7,484 KB">
<!ENTITY python-docs-md5 "32f5cd7d63adf58ca4e0687dc530ce8b">
<!ENTITY python-docs-size "7,522 KB">
<!ENTITY readline-version "8.2">
<!ENTITY readline-soversion "8.2"><!-- used for stripping -->
@ -726,13 +726,13 @@
<!ENTITY util-linux-fin-du "283 MB">
<!ENTITY util-linux-fin-sbu "1.0 SBU">
<!ENTITY vim-version "9.0.0739">
<!ENTITY vim-version "9.0.1060">
<!-- <!ENTITY vim-majmin "90"> -->
<!ENTITY vim-docdir "vim/vim90">
<!ENTITY vim-size "16,370 KB">
<!ENTITY vim-size "16,488 KB">
<!--<!ENTITY vim-url "https://github.com/vim/vim/archive/v&vim-version;/vim-&vim-version;.tar.gz">-->
<!ENTITY vim-url "&anduin-sources;/vim-&vim-version;.tar.gz">
<!ENTITY vim-md5 "d28503800dcd471edf8c308f5a74f177">
<!ENTITY vim-md5 "cee12f38abdac37edeced59461bb04d4">
<!ENTITY vim-home "https://www.vim.org">
<!ENTITY vim-fin-du "217 MB">
<!ENTITY vim-fin-sbu "2.5 SBU">
@ -753,10 +753,10 @@
<!ENTITY xml-parser-fin-du "2.3 MB">
<!ENTITY xml-parser-fin-sbu "less than 0.1 SBU">
<!ENTITY xz-version "5.2.9">
<!ENTITY xz-size "1,261 KB">
<!ENTITY xz-version "5.4.0">
<!ENTITY xz-size "1,375 KB">
<!ENTITY xz-url "https://tukaani.org/xz/xz-&xz-version;.tar.xz">
<!ENTITY xz-md5 "115d93141a38801983572f816c6dd68a">
<!ENTITY xz-md5 "3518b2c6e00400f4df5dd8d2a70fc2a9">
<!ENTITY xz-home "https://tukaani.org/xz">
<!ENTITY xz-tmp-du "16 MB">
<!ENTITY xz-tmp-sbu "0.1 SBU">