Changeset e611bb9 for BOOK/boot

Timestamp:

May 3, 2014, 1:21:12 PM (11 years ago)

Author:

Chris Staub <chris@…>

Branches:

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

Children:

665c544

Parents:

bd99508

Message:

Fix compile error for colo and colo pages more readable

Location:

BOOK/boot

Files:

• mips/colo-build.xml (modified) (1 diff)
• mips64/colo-build.xml (modified) (3 diffs)

BOOK/boot/mips/colo-build.xml

@@ -37 +37 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/mips/colo.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+<screen os="s2"><userinput>cp -v stage2/Makefile{,.orig}
+sed '/^CFLAGS/s/-Werror //' stage2/Makefile.orig > stage2/Makefile</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/mips/colo.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 

BOOK/boot/mips64/colo-build.xml

@@ -24 +24 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../mips/colo-build.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/mips64/colo.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
@@ -41 +45 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../mips/colo-build.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../mips/colo-build.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../mips/colo-build.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
 
 <screen os="aa"><userinput>cd tools/elf2rfx
@@ -50 +62 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../mips/colo-build.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"