gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-07-16 17:25:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'trunk' into xry111/tester-nohack

Browse Source
This commit is contained in:
Xi Ruoyao 2021-07-19 20:54:58 +08:00
commit 590d255947
No known key found for this signature in database
GPG Key ID: D95E4716CCBB34DC
14 changed files with 62 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
appendices/dependencies.xml
View File

@ -2402,7 +2402,7 @@
<segmentedlist id="perl-testdeps">
<segtitle>&testsuites;</segtitle>
<seglistitem>
<seg>Iana-Etc and Procps-ng</seg>
<seg>Iana-Etc, Less. and Procps-ng</seg>
</seglistitem>
</segmentedlist>

20
chapter01/changelog.xml
View File

@ -42,6 +42,26 @@
<listitem revision="sysv"> or <listitem revision="systemd"> as
appropriate for the entry or if needed the entire day's listitem.
-->
<listitem>
<para>2021-07-17</para>
<itemizedlist>
<listitem>
<para>[ken] - Fix test failures in perl-5.34.0 by building less before
perl and by patching perl for a problem highlighted by gdbm-1.20. Fixes
<ulink url="&lfs-ticket-root;4885">#4885</ulink>.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>2021-07-15</para>
<itemizedlist>
<listitem>
<para>[bdubbs] - Remove modifications to m4 that are no longer needed.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>2021-07-08</para>
<itemizedlist>

4
chapter03/introduction.xml
View File

@ -23,8 +23,8 @@
location has changed since this book was published, Google (<ulink
url="http://www.google.com/"/>) provides a useful search engine for
most packages. If this search is unsuccessful, try one of the
alternative means of downloading discussed at <ulink
url="&lfs-root;lfs/packages.html#packages"/>. </para>
alternative means of downloading at <ulink
url="&lfs-root;lfs/mirrors.html#files"/>. </para>
<para>Downloaded packages and patches will need to be stored somewhere
that is conveniently available throughout the entire build. A working

9
chapter03/patches.xml
View File

@ -102,6 +102,15 @@
</listitem>
</varlistentry>
-->
<varlistentry>
<term>Perl Upstream Fix Patch - <token>&perl-fix-patch-size;</token>:</term>
<listitem>
<para>Download: <ulink url="&patches-root;&perl-fix-patch;"/></para>
<para>MD5 sum: <literal>&perl-fix-patch-md5;</literal></para>
</listitem>
</varlistentry>
<varlistentry revision="sysv">
<term>Sysvinit Consolidated Patch - <token>&sysvinit-consolidated-patch-size;</token>:</term>
<listitem>

4
chapter06/m4.xml
View File

@ -42,12 +42,12 @@
<sect2 role="installation">
<title>Installation of M4</title>
<!--
<para>First, make some fixes introduced by glibc-2.28:</para>
<screen><userinput remap="pre">sed -i 's/IO_ftrylockfile/IO_EOF_SEEN/' lib/*.c
echo "#define _IO_IN_BACKUP 0x100" >> lib/stdio-impl.h</userinput></screen>
-->
<para>Prepare M4 for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr \

2
chapter08/bzip2.xml
View File

@ -97,7 +97,7 @@ for i in /usr/bin/{bzcat,bunzip2}; do
ln -sfv bzip2 $i
done</userinput></screen>
<para>Remove an useless static library:</para>
<para>Remove a useless static library:</para>
<screen><userinput remap="install">rm -fv /usr/lib/libbz2.a</userinput></screen>

2
chapter08/chapter08.xml
View File

@ -52,6 +52,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gperf.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="expat.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="inetutils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="less.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="perl.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xml-parser.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="intltool.xml"/>
@ -71,7 +72,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="findutils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="groff.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grub.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="less.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gzip.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iproute2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kbd.xml"/>

2
chapter08/libtool.xml
View File

@ -71,7 +71,7 @@
<!-- dev: - -disable-static works but causes additional test failures
so we manually remove the static library -->
<para>Remove an useless static library:</para>
<para>Remove a useless static library:</para>
<screen><userinput remap="install">rm -fv /usr/lib/libltdl.a</userinput></screen>

4
chapter08/m4.xml
View File

@ -39,12 +39,12 @@
<sect2 role="installation">
<title>Installation of M4</title>
<!--
<para>First, make some fixes required by glibc-2.28 and later:</para>
<screen><userinput remap="pre">sed -i 's/IO_ftrylockfile/IO_EOF_SEEN/' lib/*.c
echo "#define _IO_IN_BACKUP 0x100" >> lib/stdio-impl.h</userinput></screen>
-->
<para>Prepare M4 for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>

5
chapter08/perl.xml
View File

@ -41,6 +41,11 @@
<sect2 role="installation">
<title>Installation of Perl</title>
<para>First, apply a patch that fixes an issue highlighted by recent
versions of gdbm:</para>
<screen><userinput remap="pre">patch -Np1 -i ../&perl-fix-patch;</userinput></screen>
<para>This version of Perl now builds the Compress::Raw::Zlib and
Compress::Raw::BZip2 modules. By
default Perl will use an internal copy of the sources for the build.

7
chapter08/util-linux.xml
View File

@ -95,6 +95,13 @@
<screen role="nodump"><userinput>bash tests/run.sh --srcdir=$PWD --builddir=$PWD</userinput></screen>
</warning>
<note><para>There is one test that depends on the configuration of the kernel.
If CONFIG_USER_NS or CONFIG_PID_NS are not set, the tests will hang forever.
To work around the problem, delete one test:</para>
<screen><userinput remap="test">rm tests/ts/lsns/ioctl_ns</userinput></screen>
</note>
<screen><userinput remap="test">chown -Rv tester .
su tester -c "make -k check"</userinput></screen>

2
chapter08/zlib.xml
View File

@ -57,7 +57,7 @@
<screen><userinput remap="install">make install</userinput></screen>
<para>Remove an useless static library:</para>
<para>Remove a useless static library:</para>
<screen><userinput remap="install">rm -fv /usr/lib/libz.a</userinput></screen>

5
lfs-latest-git.php
View File

@ -127,6 +127,8 @@ if ( $package == "procps-ng" ) $dirpath = "https://gitlab.com/procps-ng/procps/
if ( $package == "psmisc" ) $dirpath = "https://gitlab.com/psmisc/psmisc/-/tags";
if ( $package == "Python" ) $dirpath = "https://www.python.org/downloads/source/";
if ( $package == "shadow" ) $dirpath = "https://github.com/shadow-maint/shadow/releases";
if ( $package == "MarkupSafe" ) $dirpath = "https://pypi.python.org/pypi/MarkupSafe/";
if ( $package == "Jinja" ) $dirpath = "https://pypi.python.org/pypi/Jinja2/";
if ( $package == "systemd" ) $dirpath = "https://github.com/systemd/systemd/releases";
if ( $package == "tcl" ) $dirpath = "http://sourceforge.net/projects/tcl/files";
if ( $package == "util-linux" ) $dirpath = max_parent( $dirpath, "v." );
@ -280,6 +282,9 @@ if ( $package == "zstd" ) $dirpath = "https://github.com/facebook/zstd/rel
if ( $package == "grub" )
return find_max( $lines, "/grub/", "/^.*grub-([\d\.]+).tar.xz.*$/" );
if ( $package == "Jinja" )
return find_max( $lines, "/Jinja/", "/^.*Jinja2 ([\d\.]+).*$/" );
if ( $package == "openssl" )
return find_max( $lines, "/openssl/", "/^.*openssl-([\d\.p]*\d.?).tar.*$/" );

5
patches.ent
View File

@ -63,6 +63,11 @@
<!ENTITY ninja-limit-jobs-patch-md5 "f537a633532492e805aa342fa869ca45">
<!ENTITY ninja-limit-jobs-patch-size "2.5 KB">
-->
<!ENTITY perl-fix-patch "perl-&perl-version;-upstream_fixes-1.patch">
<!ENTITY perl-fix-patch-md5 "fb42558b59ed95ee00eb9f1c1c9b8056">
<!ENTITY perl-fix-patch-size "1.6 KB">
<!ENTITY sysvinit-consolidated-patch "sysvinit-&sysvinit-version;-consolidated-1.patch">
<!ENTITY sysvinit-consolidated-patch-md5 "4900322141d493e74020c9cf437b2cdc">
<!ENTITY sysvinit-consolidated-patch-size "2.4 KB">