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-01-21 05:45:12 +01:00
commit cfa3be5069
6 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
chapter01/changelog.xml
View File

@ -39,6 +39,20 @@
<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>2022-01-20</para>
<itemizedlist>
<listitem>
<para>[bdubbs] - Update to expat-2.4.3 (security fixes). Fixes
<ulink url="&lfs-ticket-root;4984">#4984</ulink>.</para>
</listitem>
<listitem>
<para>[pierre] - Update to meson-0.61.1. Fixes
<ulink url="&lfs-ticket-root;4985">#4985</ulink>.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem> <listitem>
<para>2022-01-17</para> <para>2022-01-17</para>
<itemizedlist> <itemizedlist>

4
chapter03/patches.xml
View File

@ -83,7 +83,7 @@
<para>MD5 sum: <literal>&kbd-backspace-patch-md5;</literal></para> <para>MD5 sum: <literal>&kbd-backspace-patch-md5;</literal></para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<!--
<varlistentry> <varlistentry>
<term>Meson Upstream Fix Patch - <token>&meson-fix-patch-size;</token>:</term> <term>Meson Upstream Fix Patch - <token>&meson-fix-patch-size;</token>:</term>
<listitem> <listitem>
@ -91,7 +91,7 @@
<para>MD5 sum: <literal>&meson-fix-patch-md5;</literal></para> <para>MD5 sum: <literal>&meson-fix-patch-md5;</literal></para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<!--
<varlistentry> <varlistentry>
<term>Libpipeline Checks Patch - <token>&libpipeline-checks-patch-size;</token>:</term> <term>Libpipeline Checks Patch - <token>&libpipeline-checks-patch-size;</token>:</term>
<listitem> <listitem>

4
chapter08/meson.xml
View File

@ -47,13 +47,13 @@
<sect2 role="installation"> <sect2 role="installation">
<title>Installation of Meson</title> <title>Installation of Meson</title>
<!--
<para>First, apply a patch that fixes an issue identified upstream:</para> <para>First, apply a patch that fixes an issue identified upstream:</para>
<screen><userinput remap="pre">patch -Np1 -i ../&meson-fix-patch;</userinput></screen> <screen><userinput remap="pre">patch -Np1 -i ../&meson-fix-patch;</userinput></screen>
-->
<para>Compile Meson with the following command:</para> <para>Compile Meson with the following command:</para>
<screen><userinput remap="make">python3 setup.py build</userinput></screen> <screen><userinput remap="make">python3 setup.py build</userinput></screen>
<para>This package does not come with a test suite.</para> <para>This package does not come with a test suite.</para>

4
chapter08/stripping.xml
View File

@ -87,10 +87,10 @@ done</userinput><userinput>
online_usrbin="bash find strip" online_usrbin="bash find strip"
online_usrlib="libbfd-&binutils-version;.so online_usrlib="libbfd-&binutils-version;.so
libhistory.so.&readline-version; libhistory.so.&readline-soversion;
libncursesw.so.&ncurses-version; libncursesw.so.&ncurses-version;
libm.so.6 libm.so.6
libreadline.so.&readline-version; libreadline.so.&readline-soversion;
libz.so.&zlib-version; libz.so.&zlib-version;
$(cd /usr/lib; find libnss*.so* -type f)" $(cd /usr/lib; find libnss*.so* -type f)"

13
packages.ent
View File

@ -163,10 +163,10 @@
<!ENTITY eudev-fin-du "80 MB"> <!ENTITY eudev-fin-du "80 MB">
<!ENTITY eudev-fin-sbu "0.2 SBU"> <!ENTITY eudev-fin-sbu "0.2 SBU">
<!ENTITY expat-version "2.4.2"> <!ENTITY expat-version "2.4.3">
<!ENTITY expat-size "440 KB"> <!ENTITY expat-size "444 KB">
<!ENTITY expat-url "&sourceforge;expat/expat-&expat-version;.tar.xz"> <!ENTITY expat-url "&sourceforge;expat/expat-&expat-version;.tar.xz">
<!ENTITY expat-md5 "b49e50792ddb35165bab41413238f66e"> <!ENTITY expat-md5 "b1137f030590b3f0c41c69c6cd68fa90">
<!ENTITY expat-home "https://libexpat.github.io/"> <!ENTITY expat-home "https://libexpat.github.io/">
<!ENTITY expat-fin-du "13 MB"> <!ENTITY expat-fin-du "13 MB">
<!ENTITY expat-fin-sbu "0.1 SBU"> <!ENTITY expat-fin-sbu "0.1 SBU">
@ -500,10 +500,10 @@
<!ENTITY markupsafe-fin-du "516 KB"> <!ENTITY markupsafe-fin-du "516 KB">
<!ENTITY markupsafe-fin-sbu "less than 0.1 SBU"> <!ENTITY markupsafe-fin-sbu "less than 0.1 SBU">
<!ENTITY meson-version "0.61.0"> <!ENTITY meson-version "0.61.1">
<!ENTITY meson-size "1,961 KB"> <!ENTITY meson-size "1,963 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 "cfe9f5e8ef869ba498a6a84f291f0c74"> <!ENTITY meson-md5 "8ed66d5537275df3defffb66d1fb897f">
<!ENTITY meson-home "https://mesonbuild.com"> <!ENTITY meson-home "https://mesonbuild.com">
<!ENTITY meson-fin-du "40 MB"> <!ENTITY meson-fin-du "40 MB">
<!ENTITY meson-fin-sbu "less than 0.1 SBU"> <!ENTITY meson-fin-sbu "less than 0.1 SBU">
@ -616,6 +616,7 @@
<!ENTITY python-docs-size "7,105 KB"> <!ENTITY python-docs-size "7,105 KB">
<!ENTITY readline-version "8.1.2"> <!ENTITY readline-version "8.1.2">
<!ENTITY readline-soversion "8.1"><!-- used for stripping -->
<!ENTITY readline-size "2,923 KB"> <!ENTITY readline-size "2,923 KB">
<!ENTITY readline-url "&gnu;readline/readline-&readline-version;.tar.gz"> <!ENTITY readline-url "&gnu;readline/readline-&readline-version;.tar.gz">
<!ENTITY readline-md5 "12819fa739a78a6172400f399ab34f81"> <!ENTITY readline-md5 "12819fa739a78a6172400f399ab34f81">

2
patches.ent
View File

@ -58,13 +58,11 @@
<!ENTITY libpipeline-checks-patch "libpipeline-&libpipeline-version;-check_fixes-3.patch"> <!ENTITY libpipeline-checks-patch "libpipeline-&libpipeline-version;-check_fixes-3.patch">
<!ENTITY libpipeline-checks-patch-md5 "0cd71f98eadaee07647d021d2e4c8621"> <!ENTITY libpipeline-checks-patch-md5 "0cd71f98eadaee07647d021d2e4c8621">
<!ENTITY libpipeline-checks-patch-size "22 KB"> <!ENTITY libpipeline-checks-patch-size "22 KB">
-->
<!ENTITY meson-fix-patch "meson-&meson-version;-upstream_fix-2.patch"> <!ENTITY meson-fix-patch "meson-&meson-version;-upstream_fix-2.patch">
<!ENTITY meson-fix-patch-md5 "dd0b2187d287abcb41c3dd7e497b7df3"> <!ENTITY meson-fix-patch-md5 "dd0b2187d287abcb41c3dd7e497b7df3">
<!ENTITY meson-fix-patch-size "5.5 KB"> <!ENTITY meson-fix-patch-size "5.5 KB">
<!--
<!ENTITY ninja-limit-jobs-patch "ninja-&ninja-version;-add_NINJAJOBS_var-1.patch"> <!ENTITY ninja-limit-jobs-patch "ninja-&ninja-version;-add_NINJAJOBS_var-1.patch">
<!ENTITY ninja-limit-jobs-patch-md5 "f537a633532492e805aa342fa869ca45"> <!ENTITY ninja-limit-jobs-patch-md5 "f537a633532492e805aa342fa869ca45">
<!ENTITY ninja-limit-jobs-patch-size "2.5 KB"> <!ENTITY ninja-limit-jobs-patch-size "2.5 KB">