[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. 71f750e5ab03390daeb7e0652005e03d2ffd159c

git git at cross-lfs.org
Wed Jun 15 13:28:33 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  71f750e5ab03390daeb7e0652005e03d2ffd159c (commit)
      from  a8de8fab23662cedf5d110ba4e2c1cb7c7e5178b (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 71f750e5ab03390daeb7e0652005e03d2ffd159c
Author: Jonathan Norman <jonathan at bluesquarelinux.co.uk>
Date:   Wed Jun 15 21:28:26 2011 +0100

    Fixed duplicated sed again by renaming part of ther multilib 32bit final section.

diff --git a/BOOK/final-system/mips64/eglibc.xml b/BOOK/final-system/mips64/eglibc.xml
index 7300dcb..ae2001b 100644
--- a/BOOK/final-system/mips64/eglibc.xml
+++ b/BOOK/final-system/mips64/eglibc.xml
@@ -96,7 +96,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc.xml"
-    xpointer="xpointer(//*[@os='l1'])"/>
+    xpointer="xpointer(//*[@os='l1b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../multilib/eglibc.xml"
+    xpointer="xpointer(//*[@os='l2b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
diff --git a/BOOK/final-system/multilib/eglibc.xml b/BOOK/final-system/multilib/eglibc.xml
index 25279be..7d2a109 100644
--- a/BOOK/final-system/multilib/eglibc.xml
+++ b/BOOK/final-system/multilib/eglibc.xml
@@ -87,7 +87,7 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='l'])"/>
 
-    <para os="l1">In multilib, we tend to think that compiling for
+    <para os="l1b">In multilib, we tend to think that compiling for
     <literal>${CLFS_TARGET32}</literal> is <emphasis>not</emphasis>
     cross-compiling. EGLIBC takes the traditional view that if you are building
     for a different host then you are cross-compiling, so you won't be running
@@ -95,7 +95,7 @@
     the tests, many will fail if the locale files are missing. The following
     sed allows these tests to succeed:</para>
 
-<screen os="l2"><userinput>sed -i '/cross-compiling/s at ifeq@ifneq at g' ../eglibc-&eglibc-version;/localedata/Makefile</userinput></screen>
+<screen os="l2b"><userinput>sed -i '/cross-compiling/s at ifeq@ifneq at g' ../eglibc-&eglibc-version;/localedata/Makefile</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
diff --git a/BOOK/final-system/ppc64/eglibc.xml b/BOOK/final-system/ppc64/eglibc.xml
index eb12b72..b07b212 100644
--- a/BOOK/final-system/ppc64/eglibc.xml
+++ b/BOOK/final-system/ppc64/eglibc.xml
@@ -105,7 +105,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc.xml"
-    xpointer="xpointer(//*[@os='l1'])"/>
+    xpointer="xpointer(//*[@os='l1b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../multilib/eglibc.xml"
+    xpointer="xpointer(//*[@os='l2b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
diff --git a/BOOK/final-system/x86_64/eglibc.xml b/BOOK/final-system/x86_64/eglibc.xml
index 5062e7b..b2ce6ef 100644
--- a/BOOK/final-system/x86_64/eglibc.xml
+++ b/BOOK/final-system/x86_64/eglibc.xml
@@ -82,7 +82,11 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../multilib/eglibc.xml"
-    xpointer="xpointer(//*[@os='l1'])"/>
+    xpointer="xpointer(//*[@os='l1b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../multilib/eglibc.xml"
+    xpointer="xpointer(//*[@os='l2b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"

-----------------------------------------------------------------------

Summary of changes:
 BOOK/final-system/mips64/eglibc.xml   |    6 +++++-
 BOOK/final-system/multilib/eglibc.xml |    4 ++--
 BOOK/final-system/ppc64/eglibc.xml    |    6 +++++-
 BOOK/final-system/x86_64/eglibc.xml   |    6 +++++-
 4 files changed, 17 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Cross-LFS Book



More information about the Clfs-commits mailing list