Changeset 06aa05d


Ignore:
Timestamp:
03/05/2022 08:31:57 AM (7 months ago)
Author:
Xi Ruoyao <xry111@…>
Branches:
11.2, 11.2-rc1, multilib, s6-init, trunk, xry111/arm64, xry111/clfs-ng, xry111/queue-11.3
Children:
cb39502
Parents:
9c43803 (diff), 8a572f0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge tag 'xry111/lfs-next/for-trunk-20220305' into trunk

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • chapter01/whatsnew.xml

    r9c43803 r06aa05d  
    281281    <title>Added:</title>
    282282    <listitem><para></para></listitem>  <!-- satisfy build -->
    283     <!--
    284     <listitem>
    285       <para>binutils-2.37-upstream_fix-1.patch</para>
    286     </listitem>
    287     <listitem>
    288       <para>gcc-11.1.0-upstream_fixes-1.patch</para>
    289     </listitem>
    290     -->
     283    <listitem>
     284      <para>&zstd-upstream-fixes-patch;</para>
     285    </listitem>
    291286  </itemizedlist>
    292287
  • chapter03/patches.xml

    r9c43803 r06aa05d  
    142142    </varlistentry>
    143143
     144    <varlistentry>
     145      <term>Zstd Upstream Fixes Patch - <token>&zstd-upstream-fixes-patch-size;</token>:</term>
     146      <listitem>
     147        <para>Download: <ulink url="&patches-root;&zstd-upstream-fixes-patch;"/></para>
     148        <para>MD5 sum: <literal>&zstd-upstream-fixes-patch-md5;</literal></para>
     149      </listitem>
     150    </varlistentry>
    144151  </variablelist>
    145152
  • chapter04/addinguser.xml

    r9c43803 r06aa05d  
    8686esac</userinput></screen>
    8787
    88   <para>If a separate working directory was created as suggested, give
    89   user <systemitem class="username">lfs</systemitem> ownership of this
    90   directory:</para>
    91 
    92 <screen><userinput>chown -v lfs $LFS/sources</userinput></screen>
    93 
    9488  <note><para>In some host systems, the following command does not complete
    9589  properly and suspends the login to the lfs user to the background.  If the
  • chapter08/zstd.xml

    r9c43803 r06aa05d  
    4242  <sect2 role="installation">
    4343    <title>Installation of Zstd</title>
     44
     45    <para>Apply a patch to fix some issues identified by upstream:</para>
     46
     47<screen><userinput remap="pre">patch -Np1 -i ../&zstd-upstream-fixes-patch;</userinput></screen>
    4448
    4549    <para>Compile the package:</para>
  • patches.ent

    r9c43803 r06aa05d  
    8888<!ENTITY systemd-upstream-fixes-patch-md5 "71eac6abdad5fba2039dcd011a9ae5b3">
    8989<!ENTITY systemd-upstream-fixes-patch-size "20 KB">
     90
     91<!ENTITY zstd-upstream-fixes-patch "zstd-&zstd-version;-upstream_fixes-1.patch">
     92<!ENTITY zstd-upstream-fixes-patch-md5 "a7e576e3f87415fdf388392b257cdcf3">
     93<!ENTITY zstd-upstream-fixes-patch-size "4 KB">
Note: See TracChangeset for help on using the changeset viewer.