Changeset 026bb5d for BOOK/boot/ppc64/yaboot-build.xml

Timestamp:

Dec 18, 2013, 1:04:00 AM (11 years ago)

Author:

Chris Staub <chris@…>

Children:

f975b3a

Parents:

1c9985f (diff), 8abef998 (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:

Updated simp branch to match main book

File:

• BOOK/boot/ppc64/yaboot-build.xml (modified) (2 diffs)

BOOK/boot/ppc64/yaboot-build.xml

@@ -24 +24 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/ppc/yaboot.xml"
+    xpointer="xpointer(//*[@os='p3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/ppc/yaboot.xml"
+    xpointer="xpointer(//*[@os='p4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/ppc/yaboot.xml"
+    xpointer="xpointer(//*[@os='p5'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/ppc/yaboot.xml"
+    xpointer="xpointer(//*[@os='p6'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../ppc/yaboot-build.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
@@ -43 +59 @@
             -e "s/\(strip \)/${CLFS_TARGET}-\1/" \
             -e 's/-o root -g root//' \
+            -e 's/-Werror//' \
     Makefile.orig &gt; Makefile</userinput></screen>