Author: jhuntwork
Date: 2007-08-08 00:22:29 -0600 (Wed, 08 Aug 2007)
New Revision: 8292
Modified:
branches/jh/BOOK/chapter01/changelog.xml
branches/jh/BOOK/chapter06/glibc.xml
branches/jh/BOOK/general.ent
Log:
Made the change to Glibc's test-installation.pl script architecture independent
Modified: branches/jh/BOOK/chapter01/changelog.xml
===================================================================
--- branches/jh/BOOK/chapter01/changelog.xml 2007-08-08 05:47:18 UTC (rev
8291)
+++ branches/jh/BOOK/chapter01/changelog.xml 2007-08-08 06:22:29 UTC (rev
8292)
@@ -37,6 +37,16 @@
-->
<listitem>
+ <para>2007-08-08</para>
+ <itemizedlist>
+ <listitem>
+ <para>[jhuntwork] - Make the sed to Glibc's test-installation.pl file
+ architecture independent.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2007-08-07</para>
<itemizedlist>
<listitem>
Modified: branches/jh/BOOK/chapter06/glibc.xml
===================================================================
--- branches/jh/BOOK/chapter06/glibc.xml 2007-08-08 05:47:18 UTC (rev
8291)
+++ branches/jh/BOOK/chapter06/glibc.xml 2007-08-08 06:22:29 UTC (rev
8292)
@@ -78,9 +78,11 @@
test would be carried out against the wrong Glibc. We can force the script
to check the Glibc we have just installed with the following:</para>
-<screen><userinput>sed -i \
-'s|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=/lib/ld-linux-x86-64.so.2 -o|' \
- scripts/test-installation.pl</userinput></screen>
+<screen><userinput>DL=$(readelf -l /bin/sh | grep interpreter | \
+awk '{print $4}' | sed -e 's@/tools@@' -e '[EMAIL PROTECTED]@@')
+sed -i "s|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=$DL -o|" \
+ scripts/test-installation.pl
+unset DL</userinput></screen>
<para>The <command>ldd</command> shell script contains Bash-specific
syntax. Change it's default program interpreter to
<command>/bin/bash</command>
Modified: branches/jh/BOOK/general.ent
===================================================================
--- branches/jh/BOOK/general.ent 2007-08-08 05:47:18 UTC (rev 8291)
+++ branches/jh/BOOK/general.ent 2007-08-08 06:22:29 UTC (rev 8292)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-JH-20070807">
-<!ENTITY releasedate "August 7, 2007">
+<!ENTITY version "SVN-JH-20070808">
+<!ENTITY releasedate "August 8, 2007">
<!ENTITY milestone "7.0">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or
"x.y[-pre{x}]" -->
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page
