Changeset 06aa05d

Timestamp:

03/05/2022 08:31:57 AM (2 years ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, bdubbs/gcc13, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

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:

• chapter01/whatsnew.xml (modified) (1 diff)
• chapter03/patches.xml (modified) (1 diff)
• chapter04/addinguser.xml (modified) (1 diff)
• chapter08/zstd.xml (modified) (1 diff)
• patches.ent (modified) (1 diff)

chapter01/whatsnew.xml

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

chapter03/patches.xml

@@ -142 +142 @@
     </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>
 

chapter04/addinguser.xml

@@ -86 +86 @@
 esac</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
   properly and suspends the login to the lfs user to the background.  If the

chapter08/zstd.xml

@@ -42 +42 @@
   <sect2 role="installation">
     <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>

patches.ent

@@ -88 +88 @@
 <!ENTITY systemd-upstream-fixes-patch-md5 "71eac6abdad5fba2039dcd011a9ae5b3">
 <!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">