[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. 22cd957bfe9bccad26270cf1e5eb533b20eb0224
git
git at cross-lfs.org
Sat Apr 16 16:17:39 PDT 2011
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 22cd957bfe9bccad26270cf1e5eb533b20eb0224 (commit)
from 9728f92c04ce7c191b540bcaddade16245180856 (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 22cd957bfe9bccad26270cf1e5eb533b20eb0224
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sat Apr 16 19:17:26 2011 -0400
Add a sed to EGLIBC in the final system that will fix an issue with
the installation test script.
diff --git a/BOOK/final-system/alpha/eglibc.xml b/BOOK/final-system/alpha/eglibc.xml
index dbe580d..256eba4 100644
--- a/BOOK/final-system/alpha/eglibc.xml
+++ b/BOOK/final-system/alpha/eglibc.xml
@@ -27,6 +27,14 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='l1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='l2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='l3'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/common/eglibc.xml b/BOOK/final-system/common/eglibc.xml
index 8de85c0..d02dca4 100644
--- a/BOOK/final-system/common/eglibc.xml
+++ b/BOOK/final-system/common/eglibc.xml
@@ -38,10 +38,21 @@
Unicode, therefore libiconv is not required on a CLFS system.</para>
</note>
- <para os="l3">The following sed makes sure that newly built EGLIBC is tested,
- during make install, instead of the one we previously build:</para>
+ <para os="l1">At the end of the installation, the build system will run
+ a sanity test to make sure everything installed properly. This script will
+ attempt to test for a library that is only used in the test suite and is
+ never installed. Prevent the script from testing for this library with the
+ following command:</para>
-<screen os="l4"><userinput>LINKER=$(readelf -l $(file /tools/lib/libc-* | cut -f1 -d:) | sed -n 's at .*interpret.*/tools\(.*\)]$@\1 at p')
+<screen os="l2"><userinput>sed -i 's/\(&& $name ne\) "db1"/ & \1 "nss_test1"/' scripts/test-installation.pl</userinput></screen>
+
+ <para os="l3">This same script performs its tests by attempting to compile
+ test programs against certain libraries. However it does not specify the
+ ld.so, and our toolchain is still configured to use the one in /tools. The
+ following set of commands will force the script to use the complete path
+ of the new ld.so that was just installed:</para>
+
+<screen os="l4"><userinput>LINKER=$(readelf -l /tools/bin/bash | sed -n 's at .*interpret.*/tools\(.*\)]$@\1 at p')
sed -i "s|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=${LINKER} -o|" \
scripts/test-installation.pl
unset LINKER</userinput></screen>
diff --git a/BOOK/final-system/mips/eglibc.xml b/BOOK/final-system/mips/eglibc.xml
index 6386a88..c0bef51 100644
--- a/BOOK/final-system/mips/eglibc.xml
+++ b/BOOK/final-system/mips/eglibc.xml
@@ -27,6 +27,14 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='l1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='l2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='l3'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/mips64-64/eglibc.xml b/BOOK/final-system/mips64-64/eglibc.xml
index 58293af..d344ca4 100644
--- a/BOOK/final-system/mips64-64/eglibc.xml
+++ b/BOOK/final-system/mips64-64/eglibc.xml
@@ -27,6 +27,14 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='l1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='l2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='l3'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/mips64/eglibc-64bit.xml b/BOOK/final-system/mips64/eglibc-64bit.xml
index bb1ad50..48114df 100644
--- a/BOOK/final-system/mips64/eglibc-64bit.xml
+++ b/BOOK/final-system/mips64/eglibc-64bit.xml
@@ -26,6 +26,14 @@
xpointer="xpointer(//*[@os='l3'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='l1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='l2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../multilib/eglibc-64bit.xml"
xpointer="xpointer(//*[@os='l4'])"/>
diff --git a/BOOK/final-system/mips64/eglibc-n32.xml b/BOOK/final-system/mips64/eglibc-n32.xml
index 95b4e34..3f470cf 100644
--- a/BOOK/final-system/mips64/eglibc-n32.xml
+++ b/BOOK/final-system/mips64/eglibc-n32.xml
@@ -23,6 +23,14 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='l1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='l2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='l3'])"/>
<screen os="l4"><userinput>LINKER=$(readelf -l $(file /tools/lib32/libc-* | cut -f1 -d:) | sed -n 's at .*interpret.*/tools\(.*\)]$@\1 at p')
diff --git a/BOOK/final-system/mips64/eglibc.xml b/BOOK/final-system/mips64/eglibc.xml
index bcf33ab..42ede5a 100644
--- a/BOOK/final-system/mips64/eglibc.xml
+++ b/BOOK/final-system/mips64/eglibc.xml
@@ -28,6 +28,14 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='l1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='l2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='l3'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/eglibc-64bit.xml b/BOOK/final-system/multilib/eglibc-64bit.xml
index 0f7765d..9a24a83 100644
--- a/BOOK/final-system/multilib/eglibc-64bit.xml
+++ b/BOOK/final-system/multilib/eglibc-64bit.xml
@@ -23,6 +23,14 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='l1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='l2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='l3'])"/>
<screen os="l4"><userinput>LINKER=$(readelf -l $(file /tools/lib64/libc-* | cut -f1 -d:) | sed -n 's at .*interpret.*/tools\(.*\)]$@\1 at p')
diff --git a/BOOK/final-system/multilib/eglibc.xml b/BOOK/final-system/multilib/eglibc.xml
index b62c6d3..1101c59 100644
--- a/BOOK/final-system/multilib/eglibc.xml
+++ b/BOOK/final-system/multilib/eglibc.xml
@@ -28,6 +28,14 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='l1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='l2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='l3'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/ppc/eglibc.xml b/BOOK/final-system/ppc/eglibc.xml
index 73ff5cc..d43efea 100644
--- a/BOOK/final-system/ppc/eglibc.xml
+++ b/BOOK/final-system/ppc/eglibc.xml
@@ -27,6 +27,14 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='l1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='l2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='l3'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/ppc64/eglibc-64bit.xml b/BOOK/final-system/ppc64/eglibc-64bit.xml
index 7502f54..d0196f5 100644
--- a/BOOK/final-system/ppc64/eglibc-64bit.xml
+++ b/BOOK/final-system/ppc64/eglibc-64bit.xml
@@ -23,6 +23,14 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='l1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='l2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='l3'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/ppc64/eglibc.xml b/BOOK/final-system/ppc64/eglibc.xml
index 4a20dbb..3db3062 100644
--- a/BOOK/final-system/ppc64/eglibc.xml
+++ b/BOOK/final-system/ppc64/eglibc.xml
@@ -28,6 +28,14 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='l1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='l2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='l3'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/sparc64-64/eglibc.xml b/BOOK/final-system/sparc64-64/eglibc.xml
index 2c6f553..6eb65c0 100644
--- a/BOOK/final-system/sparc64-64/eglibc.xml
+++ b/BOOK/final-system/sparc64-64/eglibc.xml
@@ -27,6 +27,14 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='l1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='l2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='l3'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/sparc64/eglibc-64bit.xml b/BOOK/final-system/sparc64/eglibc-64bit.xml
index db59554..01e5a28 100644
--- a/BOOK/final-system/sparc64/eglibc-64bit.xml
+++ b/BOOK/final-system/sparc64/eglibc-64bit.xml
@@ -23,6 +23,14 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='l1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='l2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='l3'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/x86/eglibc.xml b/BOOK/final-system/x86/eglibc.xml
index f1c4563..db79fca 100644
--- a/BOOK/final-system/x86/eglibc.xml
+++ b/BOOK/final-system/x86/eglibc.xml
@@ -27,6 +27,14 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='l1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='l2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='l3'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/x86_64-64/eglibc.xml b/BOOK/final-system/x86_64-64/eglibc.xml
index 9d543a9..b59e6f9 100644
--- a/BOOK/final-system/x86_64-64/eglibc.xml
+++ b/BOOK/final-system/x86_64-64/eglibc.xml
@@ -27,6 +27,14 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='l1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='l2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='l3'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/x86_64/eglibc-64bit.xml b/BOOK/final-system/x86_64/eglibc-64bit.xml
index 9da403b..c726a17 100644
--- a/BOOK/final-system/x86_64/eglibc-64bit.xml
+++ b/BOOK/final-system/x86_64/eglibc-64bit.xml
@@ -23,6 +23,14 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='l1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='l2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='l3'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/x86_64/eglibc.xml b/BOOK/final-system/x86_64/eglibc.xml
index 9a1b84d..86f42b5 100644
--- a/BOOK/final-system/x86_64/eglibc.xml
+++ b/BOOK/final-system/x86_64/eglibc.xml
@@ -28,6 +28,14 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='l1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='l2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='l3'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-----------------------------------------------------------------------
Summary of changes:
BOOK/final-system/alpha/eglibc.xml | 8 ++++++++
BOOK/final-system/common/eglibc.xml | 17 ++++++++++++++---
BOOK/final-system/mips/eglibc.xml | 8 ++++++++
BOOK/final-system/mips64-64/eglibc.xml | 8 ++++++++
BOOK/final-system/mips64/eglibc-64bit.xml | 8 ++++++++
BOOK/final-system/mips64/eglibc-n32.xml | 8 ++++++++
BOOK/final-system/mips64/eglibc.xml | 8 ++++++++
BOOK/final-system/multilib/eglibc-64bit.xml | 8 ++++++++
BOOK/final-system/multilib/eglibc.xml | 8 ++++++++
BOOK/final-system/ppc/eglibc.xml | 8 ++++++++
BOOK/final-system/ppc64/eglibc-64bit.xml | 8 ++++++++
BOOK/final-system/ppc64/eglibc.xml | 8 ++++++++
BOOK/final-system/sparc64-64/eglibc.xml | 8 ++++++++
BOOK/final-system/sparc64/eglibc-64bit.xml | 8 ++++++++
BOOK/final-system/x86/eglibc.xml | 8 ++++++++
BOOK/final-system/x86_64-64/eglibc.xml | 8 ++++++++
BOOK/final-system/x86_64/eglibc-64bit.xml | 8 ++++++++
BOOK/final-system/x86_64/eglibc.xml | 8 ++++++++
18 files changed, 150 insertions(+), 3 deletions(-)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list