[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. b2b94a54b844f3a975381b2825f790e1543fbbcf

git git at cross-lfs.org
Tue Aug 7 14:20:46 PDT 2012


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".

The branch, master has been updated
       via  b2b94a54b844f3a975381b2825f790e1543fbbcf (commit)
      from  ec40e5f593e5954032121df9084692689751a541 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b2b94a54b844f3a975381b2825f790e1543fbbcf
Author: William Harrington <kb0iic at gmail.com>
Date:   Tue Aug 7 16:20:42 2012 -0500

    Adjust version check script to check for libc version where the host system may not use lib and lib64 for installations.

diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index ed1131a..65958b8 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -42,6 +42,9 @@
         <listitem>
           <para>[William Harrington] - Adjust XZ final system install command to properly install the lzma pkgconfig file to the proper location.</para>
         </listitem>
+        <listitem>
+          <para>[William Harrington] - Update version check script to find the libc version with hosts that use paths other than /lib and /lib64, such as multiarch distros.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
 
diff --git a/BOOK/prologue/common/hostreqs.xml b/BOOK/prologue/common/hostreqs.xml
index f3877f7..3998915 100644
--- a/BOOK/prologue/common/hostreqs.xml
+++ b/BOOK/prologue/common/hostreqs.xml
@@ -125,7 +125,7 @@ diff --version | head -n1
 find --version | head -n1
 gawk --version | head -n1
 gcc --version | head -n1
-$(find /lib{,64} -name libc.so.6) | head -n1 | cut -d" " -f1-7
+ldd $(which bash) | grep libc.so | cut -d ' ' -f 3 | bash | head -n 1 | cut -d ' ' -f 1-7
 grep --version | head -n1
 gzip --version | head -n1
 uname -s -r

-----------------------------------------------------------------------

Summary of changes:
 BOOK/introduction/common/changelog.xml |    3 +++
 BOOK/prologue/common/hostreqs.xml      |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Cross-LFS Book



More information about the Clfs-commits mailing list