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

MultiLib: Merge changes from trunk

Browse Source 
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/multilib@11687 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
Thomas Trepl 2019-10-19 17:40:04 +00:00 committed by Xℹ Ruoyao
parent 0aaf6a318a
commit 9c31d62ebd
No known key found for this signature in database
GPG Key ID: D95E4716CCBB34DC
14 changed files with 86 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
appendices/dependencies.xml
View File

@ -1114,7 +1114,7 @@
<segtitle>&external;</segtitle> <segtitle>&external;</segtitle>
<seglistitem> <seglistitem>
<seg>GPL Ghostscript</seg> <seg>Ghostscript</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
@ -2339,7 +2339,7 @@
<segtitle>&dependencies;</segtitle> <segtitle>&dependencies;</segtitle>
<seglistitem> <seglistitem>
<seg>Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, GCC, <seg>Acl, Attr, Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, GCC,
Gettext, Glibc, Grep, Make, and Sed</seg> Gettext, Glibc, Grep, Make, and Sed</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>
@ -2364,7 +2364,7 @@
<segtitle>&external;</segtitle> <segtitle>&external;</segtitle>
<seglistitem> <seglistitem>
<seg>Acl, Attr, Cracklib, and PAM</seg> <seg>Cracklib, and PAM</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>

4
bootscripts/ChangeLog
View File

@ -1,3 +1,7 @@
2019-10-04 DJ Lucas <dj@linuxfromscratch.org>
* Additional updates to facilities in LSB headers to keep proper order
* Network script depends on firewall scripts from BLFS if activated
2019-09-02 DJ Lucas <dj@linuxfromscratch.org> 2019-09-02 DJ Lucas <dj@linuxfromscratch.org>
* Update facilities in LSB headers * Update facilities in LSB headers

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

@ -16,7 +16,7 @@
# Provides: $local_fs # Provides: $local_fs
# Required-Start: udev checkfs # Required-Start: udev checkfs
# Should-Start: modules # Should-Start: modules
# Required-Stop: swap # Required-Stop: localnet
# Should-Stop: # Should-Stop:
# Default-Start: S # Default-Start: S
# Default-Stop: 0 6 # Default-Stop: 0 6

4
bootscripts/lfs/init.d/network
View File

@ -17,9 +17,9 @@
### BEGIN INIT INFO ### BEGIN INIT INFO
# Provides: $network # Provides: $network
# Required-Start: $local_fs $syslog localnet swap # Required-Start: $local_fs $syslog localnet swap
# Should-Start: # Should-Start: firewalld iptables nftables
# Required-Stop: $local_fs $syslog localnet swap # Required-Stop: $local_fs $syslog localnet swap
# Should-Stop: # Should-Stop: firewalld iptables nftables
# Default-Start: 3 4 5 # Default-Start: 3 4 5
# Default-Stop: 0 1 2 6 # Default-Stop: 0 1 2 6
# Short-Description: Starts and configures network interfaces. # Short-Description: Starts and configures network interfaces.

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

@ -16,7 +16,7 @@
# Provides: swap # Provides: swap
# Required-Start: udev # Required-Start: udev
# Should-Start: modules # Should-Start: modules
# Required-Stop: localnet # Required-Stop: localnet $local_fs
# Should-Stop: # Should-Stop:
# Default-Start: S # Default-Start: S
# Default-Stop: 0 6 # Default-Stop: 0 6

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

@ -17,7 +17,7 @@
# Required-Start: $first localnet # Required-Start: $first localnet
# Should-Start: # Should-Start:
# Required-Stop: $local_fs # Required-Stop: $local_fs
# Should-Stop: # Should-Stop: sendsignals
# Default-Start: 2 3 4 5 # Default-Start: 2 3 4 5
# Default-Stop: 0 1 6 # Default-Stop: 0 1 6
# Short-Description: Starts kernel and system log daemons. # Short-Description: Starts kernel and system log daemons.

29
chapter01/changelog.xml
View File

@ -44,6 +44,35 @@
<listitem revision="sysv"> or <listitem revision="systemd"> as <listitem revision="sysv"> or <listitem revision="systemd"> as
appropriate for the entry or if needed the entire day's listitem. appropriate for the entry or if needed the entire day's listitem.
--> -->
<listitem>
<para>2019-10-17</para>
<itemizedlist>
<listitem>
<para>[bdubbs] - Move attr and acl to be before shadow.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to linux-5.3.6. Fixes
<ulink url="&lfs-ticket-root;4534">#4534</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to man-pages-5.03. Fixes
<ulink url="&lfs-ticket-root;4536">#4536</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to meson-0.52.0. Fixes
<ulink url="&lfs-ticket-root;4535">#4535</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to Python-3.8.0. Fixes
<ulink url="&lfs-ticket-root;4538">#4538</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to binutils-2.33.1. Fixes
<ulink url="&lfs-ticket-root;4537">#4537</ulink>.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem revision="systemd"> <listitem revision="systemd">
<para>2019-10-03</para> <para>2019-10-03</para>
<itemizedlist> <itemizedlist>

12
chapter01/whatsnew.xml
View File

@ -44,9 +44,9 @@
<!--<listitem> <!--<listitem>
<para>Bc &bc-version;</para> <para>Bc &bc-version;</para>
</listitem>--> </listitem>-->
<!--<listitem> <listitem>
<para>Binutils-&binutils-version;</para> <para>Binutils-&binutils-version;</para>
</listitem>--> </listitem>
<listitem> <listitem>
<para>Bison-&bison-version;</para> <para>Bison-&bison-version;</para>
</listitem> </listitem>
@ -173,9 +173,9 @@
<listitem> <listitem>
<para>Man-DB-&man-db-version;</para> <para>Man-DB-&man-db-version;</para>
</listitem> </listitem>
<!--<listitem> <listitem>
<para>Man-pages-&man-pages-version;</para> <para>Man-pages-&man-pages-version;</para>
</listitem>--> </listitem>
<listitem> <listitem>
<para>Meson-&meson-version;</para> <para>Meson-&meson-version;</para>
</listitem> </listitem>
@ -209,9 +209,9 @@
<!--<listitem> <!--<listitem>
<para>Psmisc-&psmisc-version;</para> <para>Psmisc-&psmisc-version;</para>
</listitem>--> </listitem>-->
<!--<listitem> <listitem>
<para>Python-&python-version;</para> <para>Python-&python-version;</para>
</listitem>--> </listitem>
<!--<listitem> <!--<listitem>
<para>Readline-&readline-version;</para> <para>Readline-&readline-version;</para>
</listitem>--> </listitem>-->

9
chapter05/glibc.xml
View File

@ -51,12 +51,19 @@ cd build</userinput></screen>
<para>Next, prepare Glibc for compilation:</para> <para>Next, prepare Glibc for compilation:</para>
<screen><userinput remap="configure">../configure \ <screen arch="default"><userinput remap="configure">../configure \
--prefix=/tools \ --prefix=/tools \
--host=$LFS_TGT \ --host=$LFS_TGT \
--build=$(../scripts/config.guess) \ --build=$(../scripts/config.guess) \
--enable-kernel=&min-kernel; \ --enable-kernel=&min-kernel; \
--with-headers=/tools/include</userinput></screen> --with-headers=/tools/include</userinput></screen>
<screen arch="ml_32,ml_x32,ml_all"><userinput remap="configure">../configure \
--prefix=/tools \
--host=$LFS_TGT \
--build=$(../scripts/config.guess) \
--enable-kernel=&min-kernel; \
--enable-multi-arch \
--with-headers=/tools/include</userinput></screen>
<!-- <!--
libc_cv_forced_unwind=yes \ libc_cv_forced_unwind=yes \
libc_cv_c_cleanup=yes</userinput></screen> --> libc_cv_c_cleanup=yes</userinput></screen> -->

3
chapter06/binutils.xml
View File

@ -157,8 +157,7 @@ cd build</userinput></screen>
<screen><userinput remap="test">make -k check</userinput></screen> <screen><userinput remap="test">make -k check</userinput></screen>
<para>The PC-relative offset test and <para>The ver_test_pr16504.sh test is known to fail.</para>
the debug_msg.sh test may fail in the LFS environment.</para>
<para>Install the package:</para> <para>Install the package:</para>

4
chapter06/chapter06.xml
View File

@ -35,13 +35,13 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mpfr.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mpfr.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mpc.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mpc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="isl.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="isl.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="attr.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="acl.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shadow.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shadow.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcc.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bzip2.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bzip2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgconfig.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgconfig.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ncurses.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ncurses.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="attr.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="acl.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcap.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcap.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sed.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sed.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="psmisc.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="psmisc.xml"/>

13
chapter06/python.xml
View File

@ -89,15 +89,15 @@
<para>Install the package:</para> <para>Install the package:</para>
<screen><userinput remap="install">make install <screen><userinput remap="install">make install
chmod -v 755 /usr/lib/libpython&python-minor;m.so chmod -v 755 /usr/lib/libpython&python-minor;.so
chmod -v 755 /usr/lib/libpython3.so chmod -v 755 /usr/lib/libpython3.so
ln -sfv pip3.7 /usr/bin/pip3</userinput></screen> ln -sfv pip&python-minor; /usr/bin/pip3</userinput></screen>
<variablelist> <variablelist>
<title>The meaning of the install commands:</title> <title>The meaning of the install commands:</title>
<!-- ====== Change 7m if Python minor version changes ======= --> <!-- ====== Change 8m if Python minor version changes ======= -->
<varlistentry> <varlistentry>
<term><command>chmod -v 755 /usr/lib/libpython3.{7m.,}so</command></term> <term><command>chmod -v 755 /usr/lib/libpython3.{8.,}so</command></term>
<listitem> <listitem>
<para>Fix permissions for libraries to be consistent with other <para>Fix permissions for libraries to be consistent with other
libraries.</para> libraries.</para>
@ -146,10 +146,11 @@ tar --strip-components=1 \
2to3, idle3, pip3, pydoc3, python3, python3-config, and pyvenv 2to3, idle3, pip3, pydoc3, python3, python3-config, and pyvenv
</seg> </seg>
<seg> <seg>
libpython&python-minor;m.so and libpython3.so libpython&python-minor;.so and libpython3.so
</seg> </seg>
<seg> <seg>
/usr/include/python&python-minor;m, /usr/lib/python3 and /usr/include/python&python-minor;,
/usr/lib/python3, and
/usr/share/doc/python-&python-version; /usr/share/doc/python-&python-version;
</seg> </seg>
</seglistitem> </seglistitem>

6
general.ent
View File

@ -1,13 +1,13 @@
<!ENTITY version "SVN-20191003"> <!ENTITY version "SVN-20191017">
<!ENTITY short-version "svn"> <!-- Used below in &blfs-book; <!ENTITY short-version "svn"> <!-- Used below in &blfs-book;
Change to x.y for release but not -rc releases --> Change to x.y for release but not -rc releases -->
<!ENTITY generic-version "development"> <!-- Use "development" or "x.y[-pre{x}]" --> <!ENTITY generic-version "development"> <!-- Use "development" or "x.y[-pre{x}]" -->
<!ENTITY versiond "20191003-systemd"> <!ENTITY versiond "20191017-systemd">
<!ENTITY short-versiond "systemd"> <!ENTITY short-versiond "systemd">
<!ENTITY generic-versiond "systemd"> <!ENTITY generic-versiond "systemd">
<!ENTITY releasedate "October 3rd, 2019"> <!ENTITY releasedate "October 17th, 2019">
<!ENTITY copyrightdate "1999-2019"><!-- jhalfs needs a literal dash, not &ndash; --> <!ENTITY copyrightdate "1999-2019"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "9.0"> <!ENTITY milestone "9.0">

36
packages.ent
View File

@ -58,10 +58,10 @@
<!ENTITY bc-ch6-du "2.8 MB"> <!ENTITY bc-ch6-du "2.8 MB">
<!ENTITY bc-ch6-sbu "0.1 SBU"> <!ENTITY bc-ch6-sbu "0.1 SBU">
<!ENTITY binutils-version "2.32"> <!ENTITY binutils-version "2.33.1">
<!ENTITY binutils-size "20,288 KB"> <!ENTITY binutils-size "20,988 KB">
<!ENTITY binutils-url "&gnu;binutils/binutils-&binutils-version;.tar.xz"> <!ENTITY binutils-url "&gnu;binutils/binutils-&binutils-version;.tar.xz">
<!ENTITY binutils-md5 "0d174cdaf85721c5723bf52355be41e6"> <!ENTITY binutils-md5 "9406231b7d9dd93731c2d06cefe8aaf1">
<!ENTITY binutils-home "&gnu-software;binutils/"><!ENTITY binutils-ch5p1-du "580 MB"> <!ENTITY binutils-home "&gnu-software;binutils/"><!ENTITY binutils-ch5p1-du "580 MB">
<!ENTITY binutils-ch5p1-sbu "1 SBU"> <!ENTITY binutils-ch5p1-sbu "1 SBU">
<!ENTITY binutils-ch5p2-du "879 MB"> <!ENTITY binutils-ch5p2-du "879 MB">
@ -430,12 +430,12 @@
<!ENTITY linux-major-version "5"> <!ENTITY linux-major-version "5">
<!ENTITY linux-minor-version "3"> <!ENTITY linux-minor-version "3">
<!ENTITY linux-patch-version "1"> <!ENTITY linux-patch-version "6">
<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">--> <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;"> <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
<!ENTITY linux-size "106,003 KB"> <!ENTITY linux-size "106,024 KB">
<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz"> <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
<!ENTITY linux-md5 "4c68633ce304b8fbc7be2d3452060c11"> <!ENTITY linux-md5 "9905ef7f60b2ad0b26f614d95f3eb1e4">
<!ENTITY linux-home "https://www.kernel.org/"> <!ENTITY linux-home "https://www.kernel.org/">
<!-- measured for 4.8.3 / gcc-6.2.0 on x86_64 : minimum is <!-- measured for 4.8.3 / gcc-6.2.0 on x86_64 : minimum is
allnoconfig extended for a hopefully-bootable build on desktop machine, allnoconfig extended for a hopefully-bootable build on desktop machine,
@ -484,18 +484,18 @@
<!ENTITY man-db-ch6-du "38 MB"> <!ENTITY man-db-ch6-du "38 MB">
<!ENTITY man-db-ch6-sbu "0.4 SBU"> <!ENTITY man-db-ch6-sbu "0.4 SBU">
<!ENTITY man-pages-version "5.02"> <!ENTITY man-pages-version "5.03">
<!ENTITY man-pages-size "1,630 KB"> <!ENTITY man-pages-size "1,639 KB">
<!ENTITY man-pages-url "&kernel;linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz"> <!ENTITY man-pages-url "&kernel;linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz">
<!ENTITY man-pages-md5 "136e5e3380963571a079693d8ae38f52"> <!ENTITY man-pages-md5 "4a85d16759c883048a1d27c741dadf17">
<!ENTITY man-pages-home "https://www.kernel.org/doc/man-pages/"> <!ENTITY man-pages-home "https://www.kernel.org/doc/man-pages/">
<!ENTITY man-pages-ch6-du "31 MB"> <!ENTITY man-pages-ch6-du "31 MB">
<!ENTITY man-pages-ch6-sbu "less than 0.1 SBU"> <!ENTITY man-pages-ch6-sbu "less than 0.1 SBU">
<!ENTITY meson-version "0.51.2"> <!ENTITY meson-version "0.52.0">
<!ENTITY meson-size "1,420 KB"> <!ENTITY meson-size "1,472 KB">
<!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz"> <!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
<!ENTITY meson-md5 "d46c4a8e3cfd27f90e2c6fe4a69e574b"> <!ENTITY meson-md5 "7ea7772414dda8ae11072244bf7ba991">
<!ENTITY meson-home "https://mesonbuild.com"> <!ENTITY meson-home "https://mesonbuild.com">
<!ENTITY meson-ch6-du "28 MB"> <!ENTITY meson-ch6-du "28 MB">
<!ENTITY meson-ch6-sbu "less than 0.1 SBU"> <!ENTITY meson-ch6-sbu "less than 0.1 SBU">
@ -589,19 +589,19 @@
<!-- If python minor version changes, updates in python and <!-- If python minor version changes, updates in python and
meson pages will be needed: python3.6 and python3.6m --> meson pages will be needed: python3.6 and python3.6m -->
<!ENTITY python-version "3.7.4"> <!ENTITY python-version "3.8.0">
<!ENTITY python-minor "3.7"> <!ENTITY python-minor "3.8">
<!ENTITY python-size "16,730 KB"> <!ENTITY python-size "17,412 KB">
<!ENTITY python-url "https://www.python.org/ftp/python/&python-version;/Python-&python-version;.tar.xz"> <!ENTITY python-url "https://www.python.org/ftp/python/&python-version;/Python-&python-version;.tar.xz">
<!ENTITY python-md5 "d33e4aae66097051c2eca45ee3604803"> <!ENTITY python-md5 "dbac8df9d8b9edc678d0f4cacdb7dbb0">
<!ENTITY python-home "https://www.python.org/"> <!ENTITY python-home "https://www.python.org/">
<!ENTITY python-ch5-du "381 MB"> <!ENTITY python-ch5-du "381 MB">
<!ENTITY python-ch5-sbu "1.4 SBU"> <!ENTITY python-ch5-sbu "1.4 SBU">
<!ENTITY python-ch6-du "399 MB"> <!ENTITY python-ch6-du "399 MB">
<!ENTITY python-ch6-sbu "1.3 SBU"> <!ENTITY python-ch6-sbu "1.3 SBU">
<!ENTITY python-docs-url "https://docs.python.org/ftp/python/doc/&python-version;/python-&python-version;-docs-html.tar.bz2"> <!ENTITY python-docs-url "https://docs.python.org/ftp/python/doc/&python-version;/python-&python-version;-docs-html.tar.bz2">
<!ENTITY python-docs-md5 "c410337e954dbba2d04fe169c355a6a2"> <!ENTITY python-docs-md5 "2d6a7a58a7b4bccbde48174e0ad0ebbc">
<!ENTITY python-docs-size "6,068 KB"> <!ENTITY python-docs-size "6,358 KB">
<!ENTITY readline-version "8.0"> <!ENTITY readline-version "8.0">
<!ENTITY readline-size "2,907 KB"> <!ENTITY readline-size "2,907 KB">