gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-06-23 13:49:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Xi Ruoyao 2022-03-05 16:31:57 +08:00
commit 06aa05dd04
No known key found for this signature in database
GPG Key ID: D95E4716CCBB34DC
5 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
chapter01/whatsnew.xml
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>

7
chapter03/patches.xml
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>

6
chapter04/addinguser.xml
View File

@ -85,12 +85,6 @@ case $(uname -m) in
x86_64) chown -v lfs $LFS/lib64 ;; x86_64) chown -v lfs $LFS/lib64 ;;
esac</userinput></screen> 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 <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

4
chapter08/zstd.xml
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>

4
patches.ent
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">