[Clfs-commits] commit: r4378 - in /trunk: BOOK/ BOOK/boot/ppc/ BOOK/boot/ppc64/ BOOK/bootable/ppc64/ BOOK/final-system/ppc/ BOOK/final-system/ppc64/ BOOK/introduction/ppc/ BOOK/introduction/ppc64/ BOOK/materials/ppc/ BOOK/materials/ppc64/ patches/
svn at cross-lfs.org
svn at cross-lfs.org
Wed Jan 7 16:03:46 PST 2009
Author: jim
Date: Thu Jan 8 00:03:45 2009
New Revision: 4378
Log:
Updated Yaboot to 1.3.14
Added:
trunk/patches/yaboot-1.3.14-ofpath_path_prefix-1.patch (props changed)
- copied unchanged from r4366, trunk/patches/yaboot-1.3.13-ofpath_path_prefix-1.patch
Removed:
trunk/patches/yaboot-1.3.13-fix-1.patch
trunk/patches/yaboot-1.3.13-ofpath_path_prefix-1.patch
trunk/patches/yaboot-1.3.13-ofpath_sata-1.patch
Modified:
trunk/BOOK/boot/ppc/yaboot-build.xml
trunk/BOOK/boot/ppc64/yaboot-build.xml
trunk/BOOK/boot/ppc64/yaboot.xml
trunk/BOOK/bootable/ppc64/yaboot.xml
trunk/BOOK/final-system/ppc/yaboot.xml
trunk/BOOK/final-system/ppc64/yaboot.xml
trunk/BOOK/introduction/ppc/changelog.xml
trunk/BOOK/introduction/ppc64/changelog.xml
trunk/BOOK/materials/ppc/patches.xml
trunk/BOOK/materials/ppc64/patches.xml
trunk/BOOK/packages.ent
trunk/BOOK/patches.ent
Modified: trunk/BOOK/boot/ppc/yaboot-build.xml
==============================================================================
--- trunk/BOOK/boot/ppc/yaboot-build.xml (original)
+++ trunk/BOOK/boot/ppc/yaboot-build.xml Thu Jan 8 00:03:45 2009
@@ -22,22 +22,6 @@
<sect2 role="installation">
<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
<filename class="directory">ybin</filename> scripts:</para>
@@ -58,13 +42,13 @@
<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>
<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>
Modified: trunk/BOOK/boot/ppc64/yaboot-build.xml
==============================================================================
--- trunk/BOOK/boot/ppc64/yaboot-build.xml (original)
+++ trunk/BOOK/boot/ppc64/yaboot-build.xml Thu Jan 8 00:03:45 2009
@@ -23,22 +23,6 @@
<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'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../ppc/yaboot-build.xml"
xpointer="xpointer(//*[@os='p1'])"/>
@@ -62,7 +46,7 @@
<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>
@@ -72,21 +56,21 @@
<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>&1 | tee instlog</userinput></screen>
<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>
Modified: trunk/BOOK/boot/ppc64/yaboot.xml
==============================================================================
--- trunk/BOOK/boot/ppc64/yaboot.xml (original)
+++ trunk/BOOK/boot/ppc64/yaboot.xml Thu Jan 8 00:03:45 2009
@@ -21,14 +21,6 @@
<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"
href="../ppc/yaboot.xml"
Modified: trunk/BOOK/bootable/ppc64/yaboot.xml
==============================================================================
--- trunk/BOOK/bootable/ppc64/yaboot.xml (original)
+++ trunk/BOOK/bootable/ppc64/yaboot.xml Thu Jan 8 00:03:45 2009
@@ -13,22 +13,6 @@
<indexterm zone="ch-bootable-yaboot">
<primary sortas="a-Yaboot">Yaboot</primary>
<secondary>configuring</secondary></indexterm>
-
- <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'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../ppc/yaboot.xml"
Modified: trunk/BOOK/final-system/ppc/yaboot.xml
==============================================================================
--- trunk/BOOK/final-system/ppc/yaboot.xml (original)
+++ trunk/BOOK/final-system/ppc/yaboot.xml Thu Jan 8 00:03:45 2009
@@ -25,29 +25,19 @@
<sect2 role="installation">
<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>
Modified: trunk/BOOK/final-system/ppc64/yaboot.xml
==============================================================================
--- trunk/BOOK/final-system/ppc64/yaboot.xml (original)
+++ trunk/BOOK/final-system/ppc64/yaboot.xml Thu Jan 8 00:03:45 2009
@@ -20,22 +20,6 @@
<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
output. Because our gcc defaults to 64-bit, we need to pass appropriate
@@ -72,21 +56,21 @@
<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">
<para>The multilib install of yaboot can fail if you miss any of the
@@ -96,14 +80,14 @@
to check it.</para>
</important>
-<screen><userinput>make PREFIX=/usr install 2>&1 | tee instlog</userinput></screen>
+<screen os='f'><userinput>make PREFIX=/usr install 2>&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>
Modified: trunk/BOOK/introduction/ppc/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/ppc/changelog.xml (original)
+++ trunk/BOOK/introduction/ppc/changelog.xml Thu Jan 8 00:03:45 2009
@@ -32,6 +32,15 @@
</listitem>
-->
+
+ <listitem>
+ <para>January 7, 2009</para>
+ <itemizedlist>
+ <listitem>
+ <para>[Jim] - Updated to Yaboot 1.3.14.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
<listitem>
<para>November 17, 2007</para>
Modified: trunk/BOOK/introduction/ppc64/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/ppc64/changelog.xml (original)
+++ trunk/BOOK/introduction/ppc64/changelog.xml Thu Jan 8 00:03:45 2009
@@ -32,6 +32,15 @@
</listitem>
-->
+
+ <listitem>
+ <para>January 7, 2009</para>
+ <itemizedlist>
+ <listitem>
+ <para>[Jim] - Updated to Yaboot 1.3.14.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
<listitem>
<para>January 8, 2008</para>
Modified: trunk/BOOK/materials/ppc/patches.xml
==============================================================================
--- trunk/BOOK/materials/ppc/patches.xml (original)
+++ trunk/BOOK/materials/ppc/patches.xml Thu Jan 8 00:03:45 2009
@@ -25,30 +25,12 @@
</listitem>
</varlistentry>
- <varlistentry os="yaboot-fix-patch">
- <term>Yaboot Fixes Patch - <token>&yaboot-fix-patch-size;</token>:</term>
- <listitem>
- <para>Download: <ulink
- url="&patches-root;&yaboot-fix-patch;"/></para>
- <para>MD5 sum: <literal>&yaboot-fix-patch-md5;</literal></para>
- </listitem>
- </varlistentry>
-
<varlistentry os="yaboot-ofpath_path-patch">
<term>Yaboot Ofpath_Path_Prefix Patch - <token>&yaboot-ofpath_path-patch-size;</token>:</term>
<listitem>
<para>Download: <ulink
url="&patches-root;&yaboot-ofpath_path-patch;"/></para>
<para>MD5 sum: <literal>&yaboot-ofpath_path-patch-md5;</literal></para>
- </listitem>
- </varlistentry>
-
- <varlistentry os="yaboot-sata-patch">
- <term>Yaboot SATA Patch - <token>&yaboot-sata-patch-size;</token>:</term>
- <listitem>
- <para>Download: <ulink
- url="&patches-root;&yaboot-sata-patch;"/></para>
- <para>MD5 sum: <literal>&yaboot-sata-patch-md5;</literal></para>
</listitem>
</varlistentry>
Modified: trunk/BOOK/materials/ppc64/patches.xml
==============================================================================
--- trunk/BOOK/materials/ppc64/patches.xml (original)
+++ trunk/BOOK/materials/ppc64/patches.xml Thu Jan 8 00:03:45 2009
@@ -57,15 +57,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../ppc/patches.xml"
- xpointer="xpointer(//*[@os='yaboot-fix-patch'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../ppc/patches.xml"
xpointer="xpointer(//*[@os='yaboot-ofpath_path-patch'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../ppc/patches.xml"
- xpointer="xpointer(//*[@os='yaboot-sata-patch'])"/>
</variablelist>
Modified: trunk/BOOK/packages.ent
==============================================================================
--- trunk/BOOK/packages.ent (original)
+++ trunk/BOOK/packages.ent Thu Jan 8 00:03:45 2009
@@ -249,10 +249,7 @@
<!ENTITY lilo-size "431 KB">
<!ENTITY lilo-url "ftp://metalab.unc.edu/pub/Linux/system/boot/lilo/lilo-&lilo-version;.src.tar.gz">
<!ENTITY lilo-md5 "72765f2aafd20e23ecf07ebd22baeec7">
-<!-- appears to be dead
- <!ENTITY lilo-home "http://lilo.go.dyndns.org">
--->
-
+<!-- appears to be dead <!ENTITY lilo-home "http://lilo.go.dyndns.org"> -->
<!ENTITY linux-dl-version "2.6">
<!ENTITY linux-version "2.6.28">
@@ -420,10 +417,10 @@
<!ENTITY util-linux-ng-md5 "9aab772ee9b1f4e67dff98169f3cb380">
<!ENTITY util-linux-ng-home "http://userweb.kernel.org/~kzak/util-linux-ng/">
-<!ENTITY yaboot-version "1.3.13">
-<!ENTITY yaboot-size "269 KB">
-<!ENTITY yaboot-url "http://penguinppc.org/bootloaders/yaboot/yaboot-&yaboot-version;.tar.gz">
-<!ENTITY yaboot-md5 "f12798d1b2063f21d07e0ae7f602ccaf">
+<!ENTITY yaboot-version "1.3.14">
+<!ENTITY yaboot-size "220 KB">
+<!ENTITY yaboot-url "http://yaboot.ozlabs.org/releases/yaboot-&yaboot-version;.tar.gz">
+<!ENTITY yaboot-md5 "9b1246c474eeb37f61081ad762563b35">
<!ENTITY yaboot-home "http://yaboot.ozlabs.org">
<!ENTITY vim-version "7.2">
Modified: trunk/BOOK/patches.ent
==============================================================================
--- trunk/BOOK/patches.ent (original)
+++ trunk/BOOK/patches.ent Thu Jan 8 00:03:45 2009
@@ -172,14 +172,6 @@
<!ENTITY powerpcutils-patch-md5 "d2776b1a4977c5711037b8f1402f792a">
<!ENTITY powerpcutils-patch-size "22 KB">
-<!ENTITY yaboot-fix-patch "yaboot-&yaboot-version;-fix-1.patch">
-<!ENTITY yaboot-fix-patch-md5 "2848f7b2a01469f9e302a8890f4daafd">
-<!ENTITY yaboot-fix-patch-size "1 KB">
-
-<!ENTITY yaboot-sata-patch "yaboot-&yaboot-version;-ofpath_sata-1.patch">
-<!ENTITY yaboot-sata-patch-md5 "bdc55ca22b1cfc774a7b2db732524eb6">
-<!ENTITY yaboot-sata-patch-size "1 KB">
-
<!ENTITY yaboot-ofpath_path-patch "yaboot-&yaboot-version;-ofpath_path_prefix-1.patch">
<!ENTITY yaboot-ofpath_path-patch-md5 "3faf70e0cb4e4f62a1e8815c3452ab38">
<!ENTITY yaboot-ofpath_path-patch-size "1 KB">
More information about the Clfs-commits
mailing list