diff options
| author | Matthew Burgess <matthew@linuxfromscratch.org> | 2011-12-28 17:57:40 +0000 |
|---|---|---|
| committer | Matthew Burgess <matthew@linuxfromscratch.org> | 2011-12-28 17:57:40 +0000 |
| commit | 9ab4ef5891dc1e7b003d695b16d6a7041a728810 (patch) | |
| tree | 82031f5f09a400b5830105e8657e4da9ea68da13 | |
| parent | fa7839124966ea2408f0f6052bc27d97904ee9d3 (diff) | |
Fix version-check.sh's Glibc version detection on 64-bit Debian hosts. Thanks to Pierre Labastie for the report and fix.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9696 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
| -rw-r--r-- | chapter01/changelog.xml | 10 | ||||
| -rw-r--r-- | general.ent | 4 | ||||
| -rw-r--r-- | prologue/hostreqs.xml | 3 |
3 files changed, 14 insertions, 3 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index e7e21195f..838f9059c 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -37,6 +37,16 @@ --> <listitem> + <para>2011-12-28</para> + <itemizedlist> + <listitem> + <para>[matthew] - Fix version-check.sh's Glibc version detection on 64-bit Debian hosts. + Thanks to Pierre Labastie for the report and fix.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>2011-12-22</para> <itemizedlist> <listitem> diff --git a/general.ent b/general.ent index ced8095b6..4a249bac8 100644 --- a/general.ent +++ b/general.ent @@ -1,5 +1,5 @@ -<!ENTITY version "SVN-20111223"> -<!ENTITY releasedate "Dec 23, 2011"> +<!ENTITY version "SVN-20111228"> +<!ENTITY releasedate "Dec 28, 2011"> <!ENTITY copyrightdate "1999-2011"><!-- jhalfs needs a literal dash, not – --> <!ENTITY milestone "7.1"> <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" --> diff --git a/prologue/hostreqs.xml b/prologue/hostreqs.xml index 79ee2e96a..751bc9525 100644 --- a/prologue/hostreqs.xml +++ b/prologue/hostreqs.xml @@ -169,7 +169,8 @@ if [ -e /usr/bin/awk ]; then echo "/usr/bin/awk -> `readlink -f /usr/bin/awk`"; else echo "awk not found"; fi gcc --version | head -n1 -/lib/libc.so.6 | head -n1 | cut -d"," -f1 +libcLib="`find /lib /lib64 -name libc.so.6 -print`" +/${libcLib} | head -n1 | cut -d"," -f1 grep --version | head -n1 gzip --version | head -n1 cat /proc/version |