gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-06-25 06: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@11810 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
Thomas Trepl 2020-04-15 09:39:44 +00:00
parent a923b6ec74
commit bd67f69401
7 changed files with 77 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
appendices/dependencies.xml
View File

@ -1078,7 +1078,7 @@
<segtitle>&external;</segtitle> <segtitle>&external;</segtitle>
<seglistitem> <seglistitem>
<seg>Pcre</seg> <seg>Pcre and libsigsegv</seg>
</seglistitem> </seglistitem>
</segmentedlist> </segmentedlist>

38
chapter01/changelog.xml
View File

@ -44,6 +44,44 @@
<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>2020-04-15</para>
<itemizedlist>
<listitem revision="systemd">
<para>[renodr] - Install the man pages in systemd. Fixes
<ulink url="&lfs-ticket-root;4627">#4627</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to gawk-5.1.0. Fixes
<ulink url="&lfs-ticket-root;4629">#4629</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to gettext-0.20.2. Fixes
<ulink url="&lfs-ticket-root;4628">#4628</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to man-pages-5.06. Fixes
<ulink url="&lfs-ticket-root;4626">#4626</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to bc-2.6.1. Fixes
<ulink url="&lfs-ticket-root;4625">#4625</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to bison-3.5.4. Fixes
<ulink url="&lfs-ticket-root;4623">#4623</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to iproute2-5.6.0. Fixes
<ulink url="&lfs-ticket-root;4622">#4622</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to linux-5.6.4. Fixes
<ulink url="&lfs-ticket-root;4615">#4615</ulink>.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem> <listitem>
<para>2020-04-01</para> <para>2020-04-01</para>
<itemizedlist> <itemizedlist>

16
chapter01/whatsnew.xml
View File

@ -89,18 +89,18 @@
<!--<listitem> <!--<listitem>
<para>Flex-&flex-version;</para> <para>Flex-&flex-version;</para>
</listitem>--> </listitem>-->
<!--<listitem> <listitem>
<para>Gawk-&gawk-version;</para> <para>Gawk-&gawk-version;</para>
</listitem>--> </listitem>
<listitem> <listitem>
<para>GCC-&gcc-version;</para> <para>GCC-&gcc-version;</para>
</listitem> </listitem>
<!--<listitem> <!--<listitem>
<para>GDBM-&gdbm-version;</para> <para>GDBM-&gdbm-version;</para>
</listitem>--> </listitem>-->
<!--<listitem> <listitem>
<para>Gettext-&gettext-version;</para> <para>Gettext-&gettext-version;</para>
</listitem>--> </listitem>
<!--<listitem> <!--<listitem>
<para>Glibc-&glibc-version;</para> <para>Glibc-&glibc-version;</para>
</listitem>--> </listitem>-->
@ -131,9 +131,9 @@
<!--<listitem> <!--<listitem>
<para>Intltool-&intltool-version;</para> <para>Intltool-&intltool-version;</para>
</listitem>--> </listitem>-->
<!--<listitem> <listitem>
<para>IPRoute2-&iproute2-version;</para> <para>IPRoute2-&iproute2-version;</para>
</listitem>--> </listitem>
<!--<listitem> <!--<listitem>
<para>Kbd-&kbd-version;</para> <para>Kbd-&kbd-version;</para>
</listitem>--> </listitem>-->
@ -176,9 +176,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>

1
chapter06/systemd.xml
View File

@ -99,6 +99,7 @@ meson --prefix=/usr \
-Drpmmacrosdir=no \ -Drpmmacrosdir=no \
-Dhomed=false \ -Dhomed=false \
-Duserdb=false \ -Duserdb=false \
-Dman=true \
..</userinput></screen> ..</userinput></screen>
<variablelist> <variablelist>

7
chapter06/util-linux.xml
View File

@ -60,10 +60,11 @@
<screen><userinput remap="pre">sed -e 's/2^64/(2^64/' -e 's/E &lt;/E) &lt;=/' -e 's/ne /eq /' \ <screen><userinput remap="pre">sed -e 's/2^64/(2^64/' -e 's/E &lt;/E) &lt;=/' -e 's/ne /eq /' \
-i tests/ts/ipcs/limits2</userinput></screen> -i tests/ts/ipcs/limits2</userinput></screen>
--> -->
<!-- those symlinks are not created anymore
<para revision="systemd">Remove the earlier created symlinks:</para> <para revision="systemd">Remove the earlier created symlinks:</para>
<screen revision="systemd"><userinput remap="pre">rm -vf /usr/include/{blkid,libmount,uuid}</userinput></screen> <screen revision="systemd"><userinput remap="pre">rm -vf /usr/include/{blkid,libmount,uuid}</userinput></screen>
-->
<para>Prepare Util-linux for compilation:</para> <para>Prepare Util-linux for compilation:</para>
<screen revision="sysv"><userinput remap="configure">./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \ <screen revision="sysv"><userinput remap="configure">./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \
@ -109,10 +110,10 @@
coverage, other BLFS packages must be installed. If desired, this test can coverage, other BLFS packages must be installed. If desired, this test can
be run after rebooting into the completed LFS system and running:</para> be run after rebooting into the completed LFS system and running:</para>
<screen role="nodump"><userinput>bash tests/run.sh --srcdir=$PWD --builddir=$PWD</userinput></screen> <screen role="nodump"><userinput>bash tests/run.sh --srcdir=$PWD --builddir=$PWD</userinput></screen>
</warning> </warning>
<screen><userinput remap="test">chown -Rv nobody . <screen><userinput remap="test">chown -Rv nobody .
su nobody -s /bin/bash -c "PATH=$PATH make -k check"</userinput></screen> su nobody -s /bin/bash -c "PATH=$PATH make -k check"</userinput></screen>
<para>Install the package:</para> <para>Install the package:</para>

6
general.ent
View File

@ -1,13 +1,13 @@
<!ENTITY version "SVN-20200401"> <!ENTITY version "SVN-20200415">
<!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 "20200401-systemd"> <!ENTITY versiond "20200415-systemd">
<!ENTITY short-versiond "systemd"> <!ENTITY short-versiond "systemd">
<!ENTITY generic-versiond "systemd"> <!ENTITY generic-versiond "systemd">
<!ENTITY releasedate "April 1st, 2020"> <!ENTITY releasedate "April 15th, 2020">
<!ENTITY copyrightdate "1999-2020"><!-- jhalfs needs a literal dash, not &ndash; --> <!ENTITY copyrightdate "1999-2020"><!-- jhalfs needs a literal dash, not &ndash; -->

44
packages.ent
View File

@ -50,10 +50,10 @@
<!ENTITY bash-ch6-du "62 MB"> <!ENTITY bash-ch6-du "62 MB">
<!ENTITY bash-ch6-sbu "1.9 SBU"> <!ENTITY bash-ch6-sbu "1.9 SBU">
<!ENTITY bc-version "2.6.0"> <!ENTITY bc-version "2.6.1">
<!ENTITY bc-size "159 KB"> <!ENTITY bc-size "162 KB">
<!ENTITY bc-url "https://github.com/gavinhoward/bc/releases/download/&bc-version;/bc-&bc-version;.tar.xz"> <!ENTITY bc-url "https://github.com/gavinhoward/bc/releases/download/&bc-version;/bc-&bc-version;.tar.xz">
<!ENTITY bc-md5 "aa507206cef5e135b60ed82b24060447"> <!ENTITY bc-md5 "e9ffa2cba2a37e1b145034be78c3be45">
<!ENTITY bc-home "https://github.com/gavinhoward/bc"> <!ENTITY bc-home "https://github.com/gavinhoward/bc">
<!ENTITY bc-ch6-du "2.9 MB"> <!ENTITY bc-ch6-du "2.9 MB">
<!ENTITY bc-ch6-sbu "0.1 SBU"> <!ENTITY bc-ch6-sbu "0.1 SBU">
@ -70,10 +70,10 @@
<!ENTITY binutils-ch6-du "5.1 GB"> <!ENTITY binutils-ch6-du "5.1 GB">
<!ENTITY binutils-ch6-sbu "6.7 SBU"> <!ENTITY binutils-ch6-sbu "6.7 SBU">
<!ENTITY bison-version "3.5.3"> <!ENTITY bison-version "3.5.4">
<!ENTITY bison-size "2,310 KB"> <!ENTITY bison-size "2,315 KB">
<!ENTITY bison-url "&gnu;bison/bison-&bison-version;.tar.xz"> <!ENTITY bison-url "&gnu;bison/bison-&bison-version;.tar.xz">
<!ENTITY bison-md5 "f556fdd6df5ebf0c61720928811d2986"> <!ENTITY bison-md5 "eca85fc68de0aa77b26963b0a30d995a">
<!ENTITY bison-home "&gnu-software;bison/"> <!ENTITY bison-home "&gnu-software;bison/">
<!ENTITY bison-ch5-du "43 MB"> <!ENTITY bison-ch5-du "43 MB">
<!ENTITY bison-ch5-sbu "0.3 SBU"> <!ENTITY bison-ch5-sbu "0.3 SBU">
@ -212,10 +212,10 @@
<!ENTITY flex-ch6-du "36 MB"> <!ENTITY flex-ch6-du "36 MB">
<!ENTITY flex-ch6-sbu "0.4 SBU"> <!ENTITY flex-ch6-sbu "0.4 SBU">
<!ENTITY gawk-version "5.0.1"> <!ENTITY gawk-version "5.1.0">
<!ENTITY gawk-size "3,063 KB"> <!ENTITY gawk-size "3,081 KB">
<!ENTITY gawk-url "&gnu;gawk/gawk-&gawk-version;.tar.xz"> <!ENTITY gawk-url "&gnu;gawk/gawk-&gawk-version;.tar.xz">
<!ENTITY gawk-md5 "f9db3f6715207c6f13719713abc9c707"> <!ENTITY gawk-md5 "8470c34eeecc41c1aa0c5d89e630df50">
<!ENTITY gawk-home "&gnu-software;gawk/"> <!ENTITY gawk-home "&gnu-software;gawk/">
<!ENTITY gawk-ch5-du "46 MB"> <!ENTITY gawk-ch5-du "46 MB">
<!ENTITY gawk-ch5-sbu "0.2 SBU"> <!ENTITY gawk-ch5-sbu "0.2 SBU">
@ -252,10 +252,10 @@
<!ENTITY gdbm-ch6-du "11 MB"> <!ENTITY gdbm-ch6-du "11 MB">
<!ENTITY gdbm-ch6-sbu "0.1 SBU"> <!ENTITY gdbm-ch6-sbu "0.1 SBU">
<!ENTITY gettext-version "0.20.1"> <!ENTITY gettext-version "0.20.2">
<!ENTITY gettext-size "9,128 KB"> <!ENTITY gettext-size "9,292 KB">
<!ENTITY gettext-url "&gnu;gettext/gettext-&gettext-version;.tar.xz"> <!ENTITY gettext-url "&gnu;gettext/gettext-&gettext-version;.tar.xz">
<!ENTITY gettext-md5 "9ed9e26ab613b668e0026222a9c23639"> <!ENTITY gettext-md5 "0cf5f68338d5d941bbf9ac93b847310f">
<!ENTITY gettext-home "&gnu-software;gettext/"> <!ENTITY gettext-home "&gnu-software;gettext/">
<!ENTITY gettext-ch5-du "300 MB"> <!ENTITY gettext-ch5-du "300 MB">
<!ENTITY gettext-ch5-sbu "1.6 SBU"> <!ENTITY gettext-ch5-sbu "1.6 SBU">
@ -349,10 +349,10 @@
<!ENTITY intltool-ch6-du "1.5 MB"> <!ENTITY intltool-ch6-du "1.5 MB">
<!ENTITY intltool-ch6-sbu "less than 0.1 SBU"> <!ENTITY intltool-ch6-sbu "less than 0.1 SBU">
<!ENTITY iproute2-version "5.5.0"> <!ENTITY iproute2-version "5.6.0">
<!ENTITY iproute2-size "731 KB"> <!ENTITY iproute2-size "738 KB">
<!ENTITY iproute2-url "&kernel;linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz"> <!ENTITY iproute2-url "&kernel;linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz">
<!ENTITY iproute2-md5 "ee8e2cdb416d4a8ef39525d39ab7c2d0"> <!ENTITY iproute2-md5 "9da0c352707c34b8b1fec3bf42fcfd09">
<!ENTITY iproute2-home "&kernel;linux/utils/net/iproute2/"> <!ENTITY iproute2-home "&kernel;linux/utils/net/iproute2/">
<!ENTITY iproute2-ch6-du "14 MB"> <!ENTITY iproute2-ch6-du "14 MB">
<!ENTITY iproute2-ch6-sbu "0.2 SBU"> <!ENTITY iproute2-ch6-sbu "0.2 SBU">
@ -430,13 +430,13 @@
<!ENTITY libtool-ch6-sbu "1.8 SBU"> <!ENTITY libtool-ch6-sbu "1.8 SBU">
<!ENTITY linux-major-version "5"> <!ENTITY linux-major-version "5">
<!ENTITY linux-minor-version "5"> <!ENTITY linux-minor-version "6">
<!ENTITY linux-patch-version "9"> <!ENTITY linux-patch-version "4">
<!--<!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 "108,150 KB"> <!ENTITY linux-size "109,163 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 "6308d3637002211abd3b644ed0d94437"> <!ENTITY linux-md5 "3edeb26984eecdf54a03a9dd1a832c16">
<!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,
@ -487,10 +487,10 @@
<!ENTITY man-db-ch6-du "40 MB"> <!ENTITY man-db-ch6-du "40 MB">
<!ENTITY man-db-ch6-sbu "0.5 SBU"> <!ENTITY man-db-ch6-sbu "0.5 SBU">
<!ENTITY man-pages-version "5.05"> <!ENTITY man-pages-version "5.06">
<!ENTITY man-pages-size "1,649 KB"> <!ENTITY man-pages-size "1,664 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 "da25a4f8dfed0a34453c90153b98752d"> <!ENTITY man-pages-md5 "df2054d875c83bbc0bc0cfb8f53f3d43">
<!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">