Changeset 74592cf for BOOK/final-system/mips64

Timestamp:

Aug 14, 2014, 2:32:50 AM (10 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-3.0.0-sysvinit, sysvinit

Children:

c02c97a

Parents:

4b96748f

git-author:

Chris Staub <chris@…> (08/14/14 02:27:23)

git-committer:

Chris Staub <chris@…> (08/14/14 02:32:50)

Message:

Command to disable test lib is no longer needed

Conflicts:

BOOK/introduction/common/changelog.xml

Location:

BOOK/final-system/mips64

Files:

• glibc-64bit.xml (modified) (1 diff)
• glibc-n32.xml (modified) (1 diff)

BOOK/final-system/mips64/glibc-64bit.xml

@@ -24 +24 @@
     <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"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='l2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='l4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/mips64/glibc-n32.xml

@@ -26 +26 @@
     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@.*interpret.*/tools\(.*\)]$@\1@p')
+<screen os="l2"><userinput>LINKER=$(readelf -l /tools/bin/bash | sed -n 's@.*interpret.*/tools\(.*\)]$@\1@p')
 sed -i "s|libs -o|libs -L/usr/lib32 -Wl,-dynamic-linker=${LINKER} -o|" \
   scripts/test-installation.pl