Changeset 73ace20 for BOOK/final-system/mips/eglibc.xml

Timestamp:

Oct 10, 2012, 6:42:21 PM (12 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

f7b2c72

Parents:

0cce40d (diff), 80cbd64 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of git.cross-lfs.org:cross-lfs

File:

• BOOK/final-system/mips/eglibc.xml (modified) (3 diffs)

BOOK/final-system/mips/eglibc.xml

@@ -44 +44 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
+    xpointer="xpointer(//*[@os='p3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
+    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -55 +55 @@
 
     <para os="g1">MIPS is not supported in the main EGLIBC tree, so
-    we need the eglibc-ports tarball. After entering the EGLIBC source dir,
-    unpack <filename>eglibc-ports-&eglibc-version;</filename> and rename the
-    directory it creates so that EGLIBC's build system can find it:</para>
+    we need the eglibc-ports tarball. Unpack <filename>eglibc-ports-&eglibc-version;-r&eglibc-revision;</filename>:</para>
 
-<screen os="g2"><userinput>tar -jxvf ../eglibc-ports-&eglibc-ports-version;.tar.bz2
-mv -v eglibc-ports-&eglibc-version; ports</userinput></screen>
+<screen os="g2"><userinput>tar -jxvf ../eglibc-ports-&eglibc-ports-version;-r&eglibc-revision;.tar.bz2</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -126 +123 @@
     xpointer="xpointer(//*[@os='t'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='ra'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='rb'])"/>
+
   </sect2>