Changeset 73ace20 for BOOK/final-system/ppc

Timestamp:

Oct 10, 2012, 6:42:21 PM (13 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

Location:

BOOK/final-system/ppc

Files:

• eglibc.xml (modified) (2 diffs)
• yaboot.xml (modified) (1 diff)

BOOK/final-system/ppc/eglibc.xml

@@ -41 +41 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='l4'])"/>
+    
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='p3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -110 +118 @@
     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>
 

BOOK/final-system/ppc/yaboot.xml

@@ -31 +31 @@
 
 <screen os="b"><userinput>sed -i 's%/usr/local%/usr%' man/*</userinput></screen>
+
+    <para os="aa"> Prevent the build from failing due to warnings with
+    the following sed:</para>
+
+<screen os="ba"><userinput>sed -i 's%-Werror%%' Makefile</userinput></screen>
 
     <para os="c">Compile the package:</para>