[lfs] 01/01: Merge branch 'trunk' into multilib

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 multilib
in repository lfs.

commit 627e18c81a83bb6d4e01550f16678c91bdd3da0a
Merge: bfa15a772 a5e18ad3e
Author: zeckma-tech <[email protected]>
AuthorDate: Tue Aug 11 09:53:49 2026 -0600

    Merge branch 'trunk' into multilib

 chapter01/changelog.xml | 32 +++++++++++++++++++++++++++++++-
 chapter01/whatsnew.xml  |  8 ++++----
 chapter03/patches.xml   | 11 +++++------
 chapter06/coreutils.xml |  3 +--
 chapter07/zlib.xml      |  4 ++++
 chapter08/findutils.xml |  7 ++++++-
 chapter08/glibc.xml     |  9 ++++-----
 chapter08/python.xml    |  2 +-
 chapter08/stripping.xml |  2 +-
 packages.ent            | 43 ++++++++++++++++++++++---------------------
 patches.ent             | 14 ++++++--------
 11 files changed, 85 insertions(+), 50 deletions(-)

diff --cc chapter03/patches.xml
index 7b18b9027,f4c591916..63934963a
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@@ -77,11 -77,10 +77,10 @@@
      </varlistentry>
  -->
  
- <!--
      <varlistentry>
-       <term>Glibc Upstream Fixes Patch - <token>&glibc-upstream-patch-size;</token>:</term>
+       <term>Glibc Upstream Fix Patch - <token>&glibc-upstream-patch-size;</token>:</term>
        <listitem>
 -        <para>Download: <ulink url="&patches-root;&glibc-upstream-patch;"/></para>
 +        <para>Download: <ulink url="&patches-root;glibc/&glibc-upstream-patch;"/></para>
          <para>MD5 sum: <literal>&glibc-upstream-patch-md5;</literal></para>
        </listitem>
      </varlistentry>
@@@ -135,10 -126,10 +134,10 @@@
      </varlistentry>
  -->
      <varlistentry>
-       <term>Python Consolidated Patch - <token>&python-consolidated-fixes-patch-size;</token>:</term>
+       <term>Python Openssl4 Patch - <token>&python-openssl4-fixes-patch-size;</token>:</term>
        <listitem>
-         <para>Download: <ulink url="&patches-root;Python/&python-consolidated-fixes-patch;"/></para>
-         <para>MD5 sum: <literal>&python-consolidated-fixes-patch-md5;</literal></para>
 -        <para>Download: <ulink url="&patches-root;&python-openssl4-fixes-patch;"/></para>
++        <para>Download: <ulink url="&patches-root;Python/&python-openssl4-fixes-patch;"/></para>
+         <para>MD5 sum: <literal>&python-openssl4-fixes-patch-md5;</literal></para>
        </listitem>
      </varlistentry>
  
diff --cc chapter08/stripping.xml
index 39670ba89,8e660b197..4437b7834
--- a/chapter08/stripping.xml
+++ b/chapter08/stripping.xml
@@@ -84,17 -85,9 +84,17 @@@ for LIB in $save_usrlib; d
      install -vm755 /tmp/$LIB /usr/lib
      rm /tmp/$LIB
  done
 -
 +cd /usr/lib32
 +for LIB in $save_usrlib; do
 +    objcopy --only-keep-debug $LIB $LIB.dbg
 +    cp $LIB /tmp/$LIB
 +    strip --strip-unneeded /tmp/$LIB
 +    objcopy --add-gnu-debuglink=$LIB.dbg /tmp/$LIB
 +    install -vm755 /tmp/$LIB /usr/lib32
 +    rm /tmp/$LIB
 +done
  online_usrbin="bash find strip"
- online_usrlib="libbfd-&binutils-version;.so
+ online_usrlib="libbfd-&libbfd-version;.so
                 libsframe.so.&libsframe-version;
                 libhistory.so.&readline-soversion;
                 libncursesw.so.&ncurses-base-version;

-- 
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.