Changeset 291bd8b for BOOK/final-system

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/final-system

Files:

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

BOOK/final-system/ppc/yaboot.xml

@@ -26 +26 @@
     <title>Installation of Yaboot</title>
 
-    <para os="a">Yaboot has a compilation error. The following patch properly
-    fixes the issue:</para>
-
-<screen os="b"><userinput>patch -Np1 -i ../&yaboot-fix-patch;</userinput></screen>
-
-    <para os="c">The following patch removes a redundant test which prevents
-    <command>ofpath</command> from executing against SATA disks:</para>
-
-<screen os="d"><userinput>patch -Np1 -i ../&yaboot-sata-patch;</userinput></screen>
-
-    <para os="e">The supplied man pages have <filename
+    <para os="a">The supplied man pages have <filename
     class="directory">/usr/local</filename> in the text. This sed will correct
     that:</para>
 
-<screen os="f"><userinput>sed -i 's%/usr/local%/usr%' man/*</userinput></screen>
+<screen os="b"><userinput>sed -i 's%/usr/local%/usr%' man/*</userinput></screen>
 
-    <para os="g">Compile the package:</para>
+    <para os="c">Compile the package:</para>
 
-<screen os="h"><userinput>make PREFIX=/usr</userinput></screen>
+<screen os="d"><userinput>make PREFIX=/usr</userinput></screen>
 
-    <para os="i">Install the package:</para>
+    <para os="e">Install the package:</para>
 
-<screen os="j"><userinput>make PREFIX=/usr install</userinput></screen>
+<screen os="f"><userinput>make PREFIX=/usr install</userinput></screen>
 
   </sect2>

BOOK/final-system/ppc64/yaboot.xml

@@ -21 +21 @@
   <sect2 role="installation">
     <title>Installation of Yaboot</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <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"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
 
     <para>Existing multilib distributions alter gcc to default to 32-bit
@@ -73 +57 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="h"><userinput>CFLAGS="${BUILD32}" make PREFIX=/usr</userinput></screen>
+<screen os="d"><userinput>CFLAGS="${BUILD32}" make PREFIX=/usr</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <important os="j0">
@@ -97 +81 @@
     </important>
 
-<screen><userinput>make PREFIX=/usr install 2&gt;&amp;1 | tee instlog</userinput></screen>
+<screen os='f'><userinput>make PREFIX=/usr install 2&gt;&amp;1 | tee instlog</userinput></screen>
 
-    <para os='k'>To ensure that the install was successful, run the following
+    <para os='g'>To ensure that the install was successful, run the following
     command:</para>
 
-<screen os='l'><userinput>grep 'powerpc:common64' instlog</userinput></screen>
+<screen os='h'><userinput>grep 'powerpc:common64' instlog</userinput></screen>
 
-    <para os='m'>If the command gave you <emphasis>any</emphasis> output
+    <para os='i'>If the command gave you <emphasis>any</emphasis> output
     (... is incompatible with powerpc:common output) the build of yaboot is
     broken and you will have to correct your error(s) and repeat it.</para>