[lfs] 01/01: Merge remote-tracking branch 'origin/trunk' into xry111/loongarch

"Git Owner" ([email protected] via lfs-book Mailing List) <[email protected]>
Newsgroups gmane.linux.lfs.book
Message-ID <[email protected]>
This is an automated email from the git hooks/post-receive script.

git pushed a commit to branch xry111/loongarch
in repository lfs.

commit cbd510c7e070bd0695fd9a2e5cd640334f150823
Merge: 877d3dae5 455724dc3
Author: Xi Ruoyao <[email protected]>
AuthorDate: Sun Jun 1 17:21:04 2025 +0800

    Merge remote-tracking branch 'origin/trunk' into xry111/loongarch

 chapter01/changelog.xml     | 54 ++++++++++++++++++++++++++++++
 chapter01/whatsnew.xml      | 40 ++++++++++++++--------
 chapter03/patches.xml       | 43 ++++++++++++++----------
 chapter06/bash.xml          |  4 +++
 chapter06/gcc-pass2.xml     |  4 +--
 chapter07/changingowner.xml |  2 +-
 chapter08/bc.xml            |  6 ++--
 chapter08/coreutils.xml     |  4 +++
 chapter08/expect.xml        |  4 +--
 chapter08/glibc.xml         |  5 +--
 chapter08/gmp.xml           |  4 +++
 chapter08/kbd.xml           |  9 +++--
 chapter08/ncurses.xml       |  4 +--
 chapter08/perl.xml          |  4 +++
 chapter08/python.xml        | 21 +++++++++---
 chapter11/reboot.xml        |  9 ++---
 packages.ent                | 81 +++++++++++++++++++++++----------------------
 patches.ent                 | 37 +++++++++++++--------
 18 files changed, 226 insertions(+), 109 deletions(-)

diff --cc chapter03/patches.xml
index 75b4de9bd,94b36acb5..befa2f956
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@@ -26,24 -26,16 +26,24 @@@
        </listitem>
      </varlistentry>
  -->
- <!--
+ 
      <varlistentry>
-       <term>Bash Upstream Fixes Patch - <token>&bash-upstream-fixes-patch-size;</token>:</term>
+       <term>Bash Cross Compile Fix Patch - <token>&bash-crosscompile-fix-patch-size;</token>:</term>
        <listitem>
-         <para>Download: <ulink url="&patches-root;&bash-upstream-fixes-patch;"/></para>
-         <para>MD5 sum: <literal>&bash-upstream-fixes-patch-md5;</literal></para>
+         <para>Download: <ulink url="&patches-root;&bash-crosscompile-fix-patch;"/></para>
+         <para>MD5 sum: <literal>&bash-crosscompile-fix-patch-md5;</literal></para>
        </listitem>
      </varlistentry>
- -->
+ 
  <!--
 +    <varlistentry>
 +      <term>Binutils LoongArch Fix Patch - <token>&binutils-loongarch-patch-size;</token>:</term>
 +      <listitem>
 +        <para>Download: <ulink url="&lfs-root;~xry111/lfs/patches/&binutils-loongarch-patch;"/></para>
 +        <para>MD5 sum: <literal>&binutils-loongarch-patch-md5;</literal></para>
 +      </listitem>
 +    </varlistentry>
 +
      <varlistentry>
        <term>Binutils Upstream Fixes Patch - <token>&binutils-upstream-patch-size;</token>:</term>
        <listitem>
diff --cc chapter07/changingowner.xml
index 8997d91f0,f29932694..bdbd7f31f
--- a/chapter07/changingowner.xml
+++ b/chapter07/changingowner.xml
@@@ -33,6 -33,9 +33,6 @@@
    user <systemitem class="username">root</systemitem> by running the following
    command:</para>
  
- <screen><userinput>chown --from &lfs-username; -R root:root $LFS/{usr,lib,lib64,var,etc,bin,sbin,tools}</userinput></screen>
 -<screen><userinput>chown --from &lfs-username; -R root:root $LFS/{usr,var,etc,tools}
 -case $(uname -m) in
 -  x86_64) chown --from &lfs-username; -R root:root $LFS/lib64 ;;
 -esac</userinput></screen>
++<screen><userinput>chown --from &lfs-username; -R root:root $LFS/{usr,lib64,var,etc,tools}</userinput></screen>
  
  </sect1>
diff --cc chapter08/expect.xml
index 42ad288df,f23e7d8c4..de28e479b
--- a/chapter08/expect.xml
+++ b/chapter08/expect.xml
@@@ -67,13 -67,9 +67,13 @@@
      GDBM, and of course Expect itself) will fail catastrophically, and other
      subtle breakages may also happen.</para>
  
 +    &update-config-text;
 +
 +<screen><userinput remap="pre">tar -C tclconfig &update-config-arg;</userinput></screen>
 +
-     <para>Now, make some changes to allow the package with gcc-14.1 or later:</para>
+     <para>Now, make some changes to allow the package with gcc-15.1 or later:</para>
  
- <screen><userinput remap="pre">patch -Np1 -i ../expect-&expect-version;-gcc14-1.patch</userinput></screen>
+ <screen><userinput remap="pre">patch -Np1 -i ../&expect-gcc15-patch;</userinput></screen>
  
      <para>Prepare Expect for compilation:</para>
  

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

-- 
http://lists.linuxfromscratch.org/sympa/info/lfs-book
Unsubscribe: See the above information page
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.