[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, sysvinit, updated. clfs-3.0.0-rc1-sysvinit-57-g74592cf
git
git at cross-lfs.org
Thu Aug 14 02:33:01 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, sysvinit has been updated
via 74592cf2208ae5c38137af201fb7949e32d9ad27 (commit)
via 4b96748f53d7b7d88bc8aa7c312dda98f95f91f0 (commit)
from a1f098bfbc13e78b527a76a681509e052e9ca204 (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 74592cf2208ae5c38137af201fb7949e32d9ad27
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
Conflicts:
BOOK/introduction/common/changelog.xml
diff --git a/BOOK/final-system/common/glibc.xml b/BOOK/final-system/common/glibc.xml
index 1a39143..d45b0bc 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 c0e56fa..341b969 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 91640fc..0fd5fe5 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 6dc4e32..808650f 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 0f27705..f8093b0 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 055101a..f255eb2 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 6e80276..9420535 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 2f2a7b8..a41ab5d 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 b578d5d..774f712 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 c0a4e60..b8d51ca 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 f700394..5f59085 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 27b2cdb..55ddf24 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 fd8f540..02fce6d 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -37,6 +37,16 @@
-->
<listitem>
+ <para>14 August 2014</para>
+ <itemizedlist>
+ <listitem>
+ <para>[Chris] - Removed obsolete command to disable test lib
+ in Glibc instructions.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>10 August 2014</para>
<itemizedlist>
<listitem>
commit 4b96748f53d7b7d88bc8aa7c312dda98f95f91f0
Author: Chris Staub <chris at beaker67.com>
Date: Thu Aug 14 04:31:29 2014 -0400
Updated date
diff --git a/BOOK/general.ent b/BOOK/general.ent
index 8d950f1..9100732 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -2,7 +2,7 @@
<!ENTITY month "08"> <!-- Use two digits -->
<!ENTITY month_name "August">
-<!ENTITY day "10"> <!-- Use two digits -->
+<!ENTITY day "14"> <!-- Use two digits -->
<!ENTITY year "2014"> <!-- Use four digits -->
<!ENTITY releasedate "&month_name; &day;, &year;">
-----------------------------------------------------------------------
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/general.ent | 2 +-
BOOK/introduction/common/changelog.xml | 10 ++++++++++
17 files changed, 22 insertions(+), 130 deletions(-)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list