[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. clfs-3.0.0-rc1-systemd-62-g0646479
git
git at cross-lfs.org
Thu Aug 14 02:33:12 PDT 2014
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 0646479961c3e50a7773395ce396fffd818552dc (commit)
from 09e511ce8eb4a6213c4fa72498f8db23012a365b (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 0646479961c3e50a7773395ce396fffd818552dc
Author: Chris Staub <chris at beaker67.com>
Date: Thu Aug 14 05:27:23 2014 -0400
Command to disable test lib is no longer needed
diff --git a/BOOK/final-system/common/glibc.xml b/BOOK/final-system/common/glibc.xml
index 6538274..4ec7586 100644
--- a/BOOK/final-system/common/glibc.xml
+++ b/BOOK/final-system/common/glibc.xml
@@ -39,22 +39,16 @@
</note>
<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="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
- path to <filename class="libraryfile">ld.so</filename>, and our toolchain
+ a sanity test to make sure everything installed properly. This script
+ performs its tests by attempting to compile test programs against certain
+ libraries. However it does not specify the path to
+ <filename class="libraryfile">ld.so</filename>, and our toolchain
is still configured to use the one in
<filename class="directory">/tools</filename>. The following set of
commands will force the script to use the complete path of the new
<filename class="libraryfile">ld.so</filename> that was just installed:</para>
-<screen os="l4"><userinput>LINKER=$(readelf -l /tools/bin/bash | sed -n 's at .*interpret.*/tools\(.*\)]$@\1 at p')
+<screen os="l2"><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/mips64-64/glibc.xml b/BOOK/final-system/mips64-64/glibc.xml
index c655275..d164d04 100644
--- a/BOOK/final-system/mips64-64/glibc.xml
+++ b/BOOK/final-system/mips64-64/glibc.xml
@@ -35,14 +35,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/glibc.xml"
- xpointer="xpointer(//*[@os='l3'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/glibc.xml"
- xpointer="xpointer(//*[@os='l4'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/glibc.xml"
xpointer="xpointer(//*[@os='b'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/mips64/glibc-64bit.xml b/BOOK/final-system/mips64/glibc-64bit.xml
index de332f6..0eb945b 100644
--- a/BOOK/final-system/mips64/glibc-64bit.xml
+++ b/BOOK/final-system/mips64/glibc-64bit.xml
@@ -23,19 +23,11 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/glibc.xml"
- xpointer="xpointer(//*[@os='l3'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/glibc.xml"
xpointer="xpointer(//*[@os='l1'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/glibc.xml"
- xpointer="xpointer(//*[@os='l2'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../multilib/glibc-64bit.xml"
- xpointer="xpointer(//*[@os='l4'])"/>
+ xpointer="xpointer(//*[@os='l2'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../multilib/glibc.xml"
diff --git a/BOOK/final-system/mips64/glibc-n32.xml b/BOOK/final-system/mips64/glibc-n32.xml
index 4cb845b..017141c 100644
--- a/BOOK/final-system/mips64/glibc-n32.xml
+++ b/BOOK/final-system/mips64/glibc-n32.xml
@@ -25,15 +25,7 @@
href="../common/glibc.xml"
xpointer="xpointer(//*[@os='l1'])"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/glibc.xml"
- xpointer="xpointer(//*[@os='l2'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/glibc.xml"
- xpointer="xpointer(//*[@os='l3'])"/>
-
-<screen os="l4"><userinput>LINKER=$(readelf -l /tools/bin/bash | sed -n 's at .*interpret.*/tools\(.*\)]$@\1 at p')
+<screen os="l2"><userinput>LINKER=$(readelf -l /tools/bin/bash | sed -n 's at .*interpret.*/tools\(.*\)]$@\1 at p')
sed -i "s|libs -o|libs -L/usr/lib32 -Wl,-dynamic-linker=${LINKER} -o|" \
scripts/test-installation.pl
unset LINKER</userinput></screen>
diff --git a/BOOK/final-system/multilib/glibc-64bit.xml b/BOOK/final-system/multilib/glibc-64bit.xml
index ece7c89..68dc747 100644
--- a/BOOK/final-system/multilib/glibc-64bit.xml
+++ b/BOOK/final-system/multilib/glibc-64bit.xml
@@ -25,15 +25,7 @@
href="../common/glibc.xml"
xpointer="xpointer(//*[@os='l1'])"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/glibc.xml"
- xpointer="xpointer(//*[@os='l2'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/glibc.xml"
- xpointer="xpointer(//*[@os='l3'])"/>
-
-<screen os="l4"><userinput>LINKER=$(readelf -l /tools/bin/bash | sed -n 's at .*interpret.*/tools\(.*\)]$@\1 at p')
+<screen os="l2"><userinput>LINKER=$(readelf -l /tools/bin/bash | sed -n 's at .*interpret.*/tools\(.*\)]$@\1 at p')
sed -i "s|libs -o|libs -L/usr/lib64 -Wl,-dynamic-linker=${LINKER} -o|" \
scripts/test-installation.pl
unset LINKER</userinput></screen>
diff --git a/BOOK/final-system/multilib/glibc.xml b/BOOK/final-system/multilib/glibc.xml
index 08fb8f2..443cfcf 100644
--- a/BOOK/final-system/multilib/glibc.xml
+++ b/BOOK/final-system/multilib/glibc.xml
@@ -36,14 +36,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/glibc.xml"
- xpointer="xpointer(//*[@os='l3'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/glibc.xml"
- xpointer="xpointer(//*[@os='l4'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/glibc.xml"
xpointer="xpointer(//*[@os='b'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/ppc/glibc.xml b/BOOK/final-system/ppc/glibc.xml
index bcc4be4..029e6f7 100644
--- a/BOOK/final-system/ppc/glibc.xml
+++ b/BOOK/final-system/ppc/glibc.xml
@@ -35,14 +35,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/glibc.xml"
- xpointer="xpointer(//*[@os='l3'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/glibc.xml"
- xpointer="xpointer(//*[@os='l4'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/glibc.xml"
xpointer="xpointer(//*[@os='b'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/ppc64-64/glibc.xml b/BOOK/final-system/ppc64-64/glibc.xml
index 731fd78..4d14a43 100644
--- a/BOOK/final-system/ppc64-64/glibc.xml
+++ b/BOOK/final-system/ppc64-64/glibc.xml
@@ -35,14 +35,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/glibc.xml"
- xpointer="xpointer(//*[@os='l3'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/glibc.xml"
- xpointer="xpointer(//*[@os='l4'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/glibc.xml"
xpointer="xpointer(//*[@os='b'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/ppc64/glibc-64bit.xml b/BOOK/final-system/ppc64/glibc-64bit.xml
index 95acc84..f6e00d8 100644
--- a/BOOK/final-system/ppc64/glibc-64bit.xml
+++ b/BOOK/final-system/ppc64/glibc-64bit.xml
@@ -26,16 +26,8 @@
xpointer="xpointer(//*[@os='l1'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/glibc.xml"
- xpointer="xpointer(//*[@os='l2'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/glibc.xml"
- xpointer="xpointer(//*[@os='l3'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../multilib/glibc-64bit.xml"
- xpointer="xpointer(//*[@os='l4'])"/>
+ xpointer="xpointer(//*[@os='l2'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="glibc.xml"
diff --git a/BOOK/final-system/ppc64/glibc.xml b/BOOK/final-system/ppc64/glibc.xml
index 326915b..750c0b0 100644
--- a/BOOK/final-system/ppc64/glibc.xml
+++ b/BOOK/final-system/ppc64/glibc.xml
@@ -36,14 +36,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/glibc.xml"
- xpointer="xpointer(//*[@os='l3'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/glibc.xml"
- xpointer="xpointer(//*[@os='l4'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/glibc.xml"
xpointer="xpointer(//*[@os='b'])"/>
<para os="u1">The powerpc (32) architecture is expected to fail the
diff --git a/BOOK/final-system/sparc64-64/glibc.xml b/BOOK/final-system/sparc64-64/glibc.xml
index bec8ba0..e9ac03b 100644
--- a/BOOK/final-system/sparc64-64/glibc.xml
+++ b/BOOK/final-system/sparc64-64/glibc.xml
@@ -35,14 +35,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/glibc.xml"
- xpointer="xpointer(//*[@os='l3'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/glibc.xml"
- xpointer="xpointer(//*[@os='l4'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/glibc.xml"
xpointer="xpointer(//*[@os='b'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/sparc64/glibc-64bit.xml b/BOOK/final-system/sparc64/glibc-64bit.xml
index 0c82ea2..940e568 100644
--- a/BOOK/final-system/sparc64/glibc-64bit.xml
+++ b/BOOK/final-system/sparc64/glibc-64bit.xml
@@ -26,16 +26,8 @@
xpointer="xpointer(//*[@os='l1'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/glibc.xml"
- xpointer="xpointer(//*[@os='l2'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/glibc.xml"
- xpointer="xpointer(//*[@os='l3'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../multilib/glibc-64bit.xml"
- xpointer="xpointer(//*[@os='l4'])"/>
+ xpointer="xpointer(//*[@os='l2'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/glibc.xml"
diff --git a/BOOK/final-system/x86/glibc.xml b/BOOK/final-system/x86/glibc.xml
index 8d707de..99f81d6 100644
--- a/BOOK/final-system/x86/glibc.xml
+++ b/BOOK/final-system/x86/glibc.xml
@@ -35,14 +35,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/glibc.xml"
- xpointer="xpointer(//*[@os='l3'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/glibc.xml"
- xpointer="xpointer(//*[@os='l4'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/glibc.xml"
xpointer="xpointer(//*[@os='b'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/x86_64-64/glibc.xml b/BOOK/final-system/x86_64-64/glibc.xml
index eb13a2e..a853ec0 100644
--- a/BOOK/final-system/x86_64-64/glibc.xml
+++ b/BOOK/final-system/x86_64-64/glibc.xml
@@ -35,14 +35,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/glibc.xml"
- xpointer="xpointer(//*[@os='l3'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/glibc.xml"
- xpointer="xpointer(//*[@os='l4'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/glibc.xml"
xpointer="xpointer(//*[@os='b'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/x86_64/glibc-64bit.xml b/BOOK/final-system/x86_64/glibc-64bit.xml
index 3d781ef..62bd961 100644
--- a/BOOK/final-system/x86_64/glibc-64bit.xml
+++ b/BOOK/final-system/x86_64/glibc-64bit.xml
@@ -26,16 +26,8 @@
xpointer="xpointer(//*[@os='l1'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/glibc.xml"
- xpointer="xpointer(//*[@os='l2'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/glibc.xml"
- xpointer="xpointer(//*[@os='l3'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../multilib/glibc-64bit.xml"
- xpointer="xpointer(//*[@os='l4'])"/>
+ xpointer="xpointer(//*[@os='l2'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../multilib/glibc.xml"
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 006f634..f7420e3 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -43,6 +43,10 @@
<para>[Chris] - Disabled LTO for systemd build so it doesn't link
to libgcc_s. Thanks to Armin K. for the solution.</para>
</listitem>
+ <listitem>
+ <para>[Chris] - Removed obsolete command to disable test lib
+ in Glibc instructions.</para>
+ </listitem>
</itemizedlist>
</listitem>
-----------------------------------------------------------------------
Summary of changes:
BOOK/final-system/common/glibc.xml | 16 +++++-----------
BOOK/final-system/mips64-64/glibc.xml | 8 --------
BOOK/final-system/mips64/glibc-64bit.xml | 10 +---------
BOOK/final-system/mips64/glibc-n32.xml | 10 +---------
BOOK/final-system/multilib/glibc-64bit.xml | 10 +---------
BOOK/final-system/multilib/glibc.xml | 8 --------
BOOK/final-system/ppc/glibc.xml | 8 --------
BOOK/final-system/ppc64-64/glibc.xml | 8 --------
BOOK/final-system/ppc64/glibc-64bit.xml | 10 +---------
BOOK/final-system/ppc64/glibc.xml | 8 --------
BOOK/final-system/sparc64-64/glibc.xml | 8 --------
BOOK/final-system/sparc64/glibc-64bit.xml | 10 +---------
BOOK/final-system/x86/glibc.xml | 8 --------
BOOK/final-system/x86_64-64/glibc.xml | 8 --------
BOOK/final-system/x86_64/glibc-64bit.xml | 10 +---------
BOOK/introduction/common/changelog.xml | 4 ++++
16 files changed, 15 insertions(+), 129 deletions(-)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list