Changeset 291bd8b for BOOK/boot

Timestamp:

Jan 7, 2009, 4:03:45 PM (16 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

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

Children:

a02430f2

Parents:

882703f

Message:

Updated Yaboot to 1.3.14

Location:

BOOK/boot

Files:

• ppc/yaboot-build.xml (modified) (3 diffs)
• ppc64/yaboot-build.xml (modified) (4 diffs)
• ppc64/yaboot.xml (modified) (1 diff)

BOOK/boot/ppc/yaboot-build.xml

@@ -23 +23 @@
     <title>Installation of Yaboot</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
     <para os="p1">The following patch allows <command>ofpath</command> to use
     <literal>PATH_PREFIX</literal> like the other
@@ -59 +43 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>make CROSS=${CLFS_TARGET}-</userinput></screen>
@@ -65 +49 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
 <screen><userinput>make CROSS=${CLFS_TARGET}- ROOT=/tools PREFIX="" install</userinput></screen>

BOOK/boot/ppc64/yaboot-build.xml

@@ -24 +24 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../ppc/yaboot-build.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
@@ -63 +47 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
 <screen><userinput>CFLAGS=${BUILD32} make CROSS=${CLFS_TARGET}-</userinput></screen>
@@ -73 +57 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/ppc64/yaboot.xml"
-    xpointer="xpointer(//*[@os='j0'])"/>
+    xpointer="xpointer(//*[@os='e0'])"/>
 
 <screen><userinput>make CROSS=${CLFS_TARGET}- ROOT=/tools PREFIX= install 2&gt;&amp;1 | tee instlog</userinput></screen>
@@ -79 +63 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/ppc64/yaboot.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/ppc64/yaboot.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
+    xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/ppc64/yaboot.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
+    xpointer="xpointer(//*[@os='i'])"/>
 
   </sect2>

BOOK/boot/ppc64/yaboot.xml

@@ -22 +22 @@
   <sect2 role=".">
     <title>Copying the bootloader to OSX and booting from OF.</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"