Changeset 026bb5d for BOOK/boot/ppc/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/ppc/yaboot-build.xml (modified) (2 diffs)

BOOK/boot/ppc/yaboot-build.xml

@@ -23 +23 @@
     <title>Installation of Yaboot</title>
 
+    <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'])"/>
+
     <para os="p1">The following patch allows <command>ofpath</command> to use
     <literal>PATH_PREFIX</literal> like the other
@@ -33 +49 @@
     loader. It also tries to change user and group ownership for the installed
     files to <systemitem class="username">root</systemitem>, which the
-    <systemitem class="username">clfs</systemitem> user cannot do. The following
-    command fixes both issues:</para>
+    <systemitem class="username">clfs</systemitem> user cannot do. It will also
+    fail due to a compile warning with the -Werror flag on.   The following
+    command fixes these issues:</para>
 
 <screen><userinput>cp -v Makefile{,.orig}
 sed -e "s/\(strip \)/${CLFS_TARGET}-\1/" \
     -e 's/-o root -g root//' \
+    -e 's/-Werror//' \
     Makefile.orig &gt; Makefile</userinput></screen>