Merge branch 'trunk' into xry111/clfs-ng

This commit is contained in:
Xi Ruoyao 2022-03-05 16:37:30 +08:00
commit c47b168505
No known key found for this signature in database
GPG Key ID: D95E4716CCBB34DC
8 changed files with 33 additions and 14 deletions

View File

@ -40,6 +40,21 @@
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-03-05</para>
<itemizedlist>
<listitem>
<para>[xry111] - Stop changing the owner of
<filename class='directory'>$LFS/source</filename> to
<systemitem class='username'>lfs</systemitem>. Fixes
<ulink url="&lfs-ticket-root;5018">#5018</ulink>.</para>
</listitem>
<listitem>
<para>[xry111] - Add zstd-1.5.2 upstream fixes patch.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem> <listitem>
<para>2022-03-02</para> <para>2022-03-02</para>
<itemizedlist> <itemizedlist>

View File

@ -280,14 +280,9 @@
<itemizedlist> <itemizedlist>
<title>Added:</title> <title>Added:</title>
<listitem><para></para></listitem> <!-- satisfy build --> <listitem><para></para></listitem> <!-- satisfy build -->
<!--
<listitem> <listitem>
<para>binutils-2.37-upstream_fix-1.patch</para> <para>&zstd-upstream-fixes-patch;</para>
</listitem> </listitem>
<listitem>
<para>gcc-11.1.0-upstream_fixes-1.patch</para>
</listitem>
-->
</itemizedlist> </itemizedlist>
<itemizedlist> <itemizedlist>

View File

@ -141,6 +141,13 @@
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term>Zstd Upstream Fixes Patch - <token>&zstd-upstream-fixes-patch-size;</token>:</term>
<listitem>
<para>Download: <ulink url="&patches-root;&zstd-upstream-fixes-patch;"/></para>
<para>MD5 sum: <literal>&zstd-upstream-fixes-patch-md5;</literal></para>
</listitem>
</varlistentry>
</variablelist> </variablelist>
<para>Total size of these patches: about <returnvalue/></para> <para>Total size of these patches: about <returnvalue/></para>

View File

@ -82,12 +82,6 @@ useradd -s /bin/bash -g lfs -m -k /dev/null lfs</userinput></screen>
<screen><userinput>chown -v lfs $LFS/{usr{,/*},lib*,boot,var,etc,bin,sbin,tools}</userinput></screen> <screen><userinput>chown -v lfs $LFS/{usr{,/*},lib*,boot,var,etc,bin,sbin,tools}</userinput></screen>
<para>If a separate working directory was created as suggested, give
user <systemitem class="username">lfs</systemitem> ownership of this
directory:</para>
<screen><userinput>chown -v lfs $LFS/sources</userinput></screen>
<note><para>In some host systems, the following command does not complete <note><para>In some host systems, the following command does not complete
properly and suspends the login to the lfs user to the background. If the properly and suspends the login to the lfs user to the background. If the
prompt "lfs:~$" does not appear immediately, entering the prompt "lfs:~$" does not appear immediately, entering the

View File

@ -172,7 +172,7 @@ rm -rf /usr/lib/gcc/$(gcc -dumpmachine)/&gcc-version;/include-fixed/bits/</useri
<systemitem class="username">root</systemitem> user and group:</para> <systemitem class="username">root</systemitem> user and group:</para>
<screen><userinput remap="install">chown -v -R root:root \ <screen><userinput remap="install">chown -v -R root:root \
/usr/lib/gcc/*linux-gnu/&gcc-version;/include{,-fixed}</userinput></screen> /usr/lib/gcc/$(gcc -dumpmachine)/&gcc-version;/include{,-fixed}</userinput></screen>
<para>Create a symlink required by the <ulink <para>Create a symlink required by the <ulink
url="https://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch03s09.html">FHS</ulink> url="https://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch03s09.html">FHS</ulink>

View File

@ -42,6 +42,10 @@
<sect2 role="installation"> <sect2 role="installation">
<title>Installation of Zstd</title> <title>Installation of Zstd</title>
<para>Apply a patch to fix some issues identified by upstream:</para>
<screen><userinput remap="pre">patch -Np1 -i ../&zstd-upstream-fixes-patch;</userinput></screen>
<para>Compile the package:</para> <para>Compile the package:</para>
<screen><userinput remap="make">make</userinput></screen> <screen><userinput remap="make">make</userinput></screen>

View File

@ -502,7 +502,7 @@
<!ENTITY meson-md5 "7c4220066c70057b4c5a997a47ac710c"> <!ENTITY meson-md5 "7c4220066c70057b4c5a997a47ac710c">
<!ENTITY meson-home "https://mesonbuild.com"> <!ENTITY meson-home "https://mesonbuild.com">
<!ENTITY meson-fin-du "41 MB"> <!ENTITY meson-fin-du "41 MB">
<!ENTITY meson-fin-sbu "less than 0.1 SBU (about 1.8 SBU with tests)"> <!ENTITY meson-fin-sbu "less than 0.1 SBU">
<!ENTITY mpc-version "1.2.1"> <!ENTITY mpc-version "1.2.1">
<!ENTITY mpc-size "820 KB"> <!ENTITY mpc-size "820 KB">

View File

@ -87,3 +87,7 @@
<!ENTITY systemd-upstream-fixes-patch "systemd-&systemd-version;-upstream_fixes-1.patch"> <!ENTITY systemd-upstream-fixes-patch "systemd-&systemd-version;-upstream_fixes-1.patch">
<!ENTITY systemd-upstream-fixes-patch-md5 "71eac6abdad5fba2039dcd011a9ae5b3"> <!ENTITY systemd-upstream-fixes-patch-md5 "71eac6abdad5fba2039dcd011a9ae5b3">
<!ENTITY systemd-upstream-fixes-patch-size "20 KB"> <!ENTITY systemd-upstream-fixes-patch-size "20 KB">
<!ENTITY zstd-upstream-fixes-patch "zstd-&zstd-version;-upstream_fixes-1.patch">
<!ENTITY zstd-upstream-fixes-patch-md5 "a7e576e3f87415fdf388392b257cdcf3">
<!ENTITY zstd-upstream-fixes-patch-size "4 KB">