Author: ken
Date: 2006-05-10 10:56:16 -0600 (Wed, 10 May 2006)
New Revision: 1549
Modified:
trunk/BOOK/appendices/acronymlist.xml
trunk/BOOK/final-system/ppc/yaboot.xml
trunk/BOOK/final-system/ppc64/yaboot.xml
trunk/BOOK/general.ent
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/patches.ent
trunk/BOOK/stylesheets/top-index.xsl
Log:
Make yaboot work in ppc64 final-system, and label ppc64 as working in the main
index.
Modified: trunk/BOOK/appendices/acronymlist.xml
===================================================================
--- trunk/BOOK/appendices/acronymlist.xml 2006-05-10 16:32:14 UTC (rev
1548)
+++ trunk/BOOK/appendices/acronymlist.xml 2006-05-10 16:56:16 UTC (rev
1549)
@@ -51,6 +51,13 @@
</varlistentry>
<varlistentry>
+ <term><emphasis role="bold">ATA</emphasis></term>
+ <listitem>
+ <para>Advanced Technology Attachment (see IDE)</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><emphasis role="bold">BIOS</emphasis></term>
<listitem>
<para>Basic Input/Output System</para>
@@ -464,6 +471,13 @@
</varlistentry>
<varlistentry>
+ <term><emphasis role="bold">SATA</emphasis></term>
+ <listitem>
+ <para>Serial ATA</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><emphasis role="bold">SGR</emphasis></term>
<listitem>
<para>Select Graphic Rendition</para>
Modified: trunk/BOOK/final-system/ppc/yaboot.xml
===================================================================
--- trunk/BOOK/final-system/ppc/yaboot.xml 2006-05-10 16:32:14 UTC (rev
1548)
+++ trunk/BOOK/final-system/ppc/yaboot.xml 2006-05-10 16:56:16 UTC (rev
1549)
@@ -34,24 +34,30 @@
<sect2 role="installation">
<title>Installation of Yaboot</title>
- <para>Yaboot has a compilation error. The following patch properly fixes
- the issue:</para>
+ <para os="a">Yaboot has a compilation error. The following patch properly
+ fixes the issue:</para>
-<screen><userinput>patch -Np1 -i
../yaboot-&yaboot-version;-fix-1.patch</userinput></screen>
+<screen os="b"><userinput>patch -Np1 -i
../&yaboot-fix-patch;</userinput></screen>
- <para>The supplied man pages have <filename class="directory">/usr/local
- </filename> in the text. This sed will correct that:</para>
+ <para os="c">The following patch removes a redundant test which prevents
+ <command>ofpath</command> from executing against SATA disks:</para>
-<screen><userinput>sed -i 's%/usr/local%/usr%' man/*</userinput></screen>
+<screen os="d"><userinput>patch -Np1 -i
../&yaboot-sata-patch;</userinput></screen>
- <para>Compile the Yaboot package:</para>
+ <para os="e">The supplied man pages have <filename
+ class="directory">/usr/local</filename> in the text. This sed will correct
+ that:</para>
-<screen><userinput>make PREFIX=/usr</userinput></screen>
+<screen os="f"><userinput>sed -i 's%/usr/local%/usr%'
man/*</userinput></screen>
- <para>Install the package:</para>
+ <para os="g">Compile the package:</para>
-<screen><userinput>make PREFIX=/usr install</userinput></screen>
+<screen os="h"><userinput>make PREFIX=/usr</userinput></screen>
+ <para os="i">Install the package:</para>
+
+<screen os="j"><userinput>make PREFIX=/usr install</userinput></screen>
+
</sect2>
<sect2 id="contents-yaboot" role="content">
Modified: trunk/BOOK/final-system/ppc64/yaboot.xml
===================================================================
--- trunk/BOOK/final-system/ppc64/yaboot.xml 2006-05-10 16:32:14 UTC (rev
1548)
+++ trunk/BOOK/final-system/ppc64/yaboot.xml 2006-05-10 16:56:16 UTC (rev
1549)
@@ -14,163 +14,97 @@
<primary sortas="a-Yaboot">Yaboot</primary>
</indexterm>
- <sect2 role="package">
- <title/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="../ppc/yaboot.xml"
+ xpointer="xpointer(//[EMAIL PROTECTED]'package'])"/>
- <!-- this is a copy of the ppc version. once it is working, the text needs
to
- be fixed to refer to the master text instead of copying it -->
-
- <para>The Yaboot package contains a PowerPC Boot Loader for machines using
- OpenFirmware such as NewWorld Macintoshes.</para>
-
- <segmentedlist>
- <segtitle>&dependencies;</segtitle>
-
- <seglistitem>
- <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep,
- Make, Ncurses, and Sed</seg>
- </seglistitem>
- </segmentedlist>
-
- </sect2>
-
<sect2 role="installation">
<title>Installation of Yaboot</title>
- <caution>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="../ppc/yaboot.xml"
+ xpointer="xpointer(//[EMAIL PROTECTED]'a'])"/>
- <para>This does not work! For now, if you have an existing system, use
- yaboot from that system.</para>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="../ppc/yaboot.xml"
+ xpointer="xpointer(//[EMAIL PROTECTED]'b'])"/>
- </caution>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="../ppc/yaboot.xml"
+ xpointer="xpointer(//[EMAIL PROTECTED]'c'])"/>
- <para>Yaboot has a compilation error. The following patch properly fixes
- the issue:</para>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="../ppc/yaboot.xml"
+ xpointer="xpointer(//[EMAIL PROTECTED]'d'])"/>
-<screen><userinput>patch -Np1 -i
../yaboot-&yaboot-version;-fix-1.patch</userinput></screen>
+ <para>Existing multilib distributions alter gcc to default to 32-bit
+ output. Because our gcc defaults to 64-bit, we need to pass appropriate
+ options to both the compiler and the linker. The Makefile already
+ overrides any CC and ignores LDFLAGS in favour of its own variables, so we
+ need to use the following seds for a successful compile and install.</para>
- <para>The supplied man pages have <filename class="directory">/usr/local
- </filename> in the text. This sed will correct that:</para>
+<screen><userinput>sed -i -e "s/\(-print-libgcc-file-name\)/${BUILD32} \1/" \
+ -e "s/\(-Bstatic\)/-melf32ppclinux \1/" Makefile
+</userinput></screen>
-<screen><userinput>sed -i 's%/usr/local%/usr%' man/*</userinput></screen>
+ <variablelist os="j">
+ <title>The meaning of the sed parameters:</title>
- <para>Compile the Yaboot package:</para>
-
-<screen><userinput>make PREFIX=/usr</userinput></screen>
-
- <para>Install the package:</para>
-
-<screen><userinput>make PREFIX=/usr install</userinput></screen>
-
- </sect2>
-
- <sect2 id="contents-yaboot" role="content">
- <title>Contents of Yaboot</title>
-
- <segmentedlist>
- <segtitle>Installed programs</segtitle>
- <segtitle>Installed files</segtitle>
-
- <seglistitem>
- <seg>addnote, mkofboot (link to ybin), ofboot, ofpath, yaboot,
- yabootconfig, ybin</seg>
- <seg>yaboot.conf</seg>
- </seglistitem>
- </segmentedlist>
-
- <variablelist>
- <bridgehead renderas="sect3">Short Descriptions</bridgehead>
- <?dbfo list-presentation="list"?>
- <?dbhtml list-presentation="table"?>
-
- <varlistentry id="addnote">
- <term><command>addnote</command></term>
- <listitem>
- <para>For IBM CHRP machines, add a PT_NOTE program header
- entry to an elf file so that it can be booted.</para>
- <indexterm zone="ch-system-yaboot addnote">
- <primary sortas="b-addnote">addnote</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="mkofboot">
- <term><command>mkofboot</command></term>
+ <varlistentry>
+ <term><parameter>"s/\(-print-libgcc-file-name\)/${BUILD32}
\1/"</parameter></term>
<listitem>
- <para>Format the bootstrap partition and install the yaboot
- boot loader.</para>
- <indexterm zone="ch-system-yaboot mkofboot">
- <primary sortas="b-mkofboot">mkofboot</primary>
- </indexterm>
+ <para>This picks a convenient place within the Makefile's lgcc
+ variable and inserts the flag to force <command>gcc</command> to
+ create 32-bit code when compiling yaboot.</para>
</listitem>
</varlistentry>
-
- <varlistentry id="ofboot">
- <term><command>ofboot</command></term>
+ <varlistentry>
+ <term><parameter>"s/\(-Bstatic\)/-melf32ppclinux
\1/"</parameter></term>
<listitem>
- <para>Script to format the boot menu using yaboot.conf and
- write the resulting OpenFirmware code to the bootstrap.</para>
- <indexterm zone="ch-system-yaboot ofboot">
- <primary sortas="b-ofboot">ofboot</primary>
- </indexterm>
+ <para>This picks the end of the LFLAGS which the Makefile passes to
+ the linker to create the second-stage linux loader, and inserts a
+ flag to force <command>ld</command> to use a suitable 32-bit
+ emulation picked from the output of <command>'ld -V'</command>.</para>
</listitem>
</varlistentry>
- <varlistentry id="ofpath">
- <term><command>ofpath</command></term>
- <listitem>
- <para>Determine OpenFirmware path corresponding to a device
- node.</para>
- <indexterm zone="ch-system-yaboot ofpath">
- <primary sortas="b-ofpath">ofpath</primary>
- </indexterm>
- </listitem>
- </varlistentry>
+ </variablelist>
- <varlistentry id="yaboot">
- <term><command>yaboot</command></term>
- <listitem>
- <para>OpenFirmware boot loader.</para>
- <indexterm zone="ch-system-yaboot yaboot">
- <primary sortas="b-yaboot">yaboot</primary>
- </indexterm>
- </listitem>
- </varlistentry>
+ <important>
+ <para>The above patches and seds are critical in ensuring a
+ successful build. In particular, the package will appear to install
+ correctly without the second sed, but will fail to load linux,
+ requiring you to use OF or a rescue disk to boot.</para>
+ </important>
- <varlistentry id="yabootconfig">
- <term><command>yabootconfig</command></term>
- <listitem>
- <para>Generate and install a simple yaboot.conf.</para>
- <indexterm zone="ch-system-yaboot yabootconfig">
- <primary sortas="b-yabootconfig">yabootconfig</primary>
- </indexterm>
- </listitem>
- </varlistentry>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="../ppc/yaboot.xml"
+ xpointer="xpointer(//[EMAIL PROTECTED]'e'])"/>
- <varlistentry id="ybin">
- <term><command>ybin</command></term>
- <listitem>
- <para>Shell script to update or install the boot loader
- on a bootstrap partition.</para>
- <indexterm zone="ch-system-yaboot ybin">
- <primary sortas="b-ybin">ybin</primary>
- </indexterm>
- </listitem>
- </varlistentry>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="../ppc/yaboot.xml"
+ xpointer="xpointer(//[EMAIL PROTECTED]'f'])"/>
- <varlistentry id="yaboot.conf">
- <term><filename>yaboot.conf</filename></term>
- <listitem>
- <para>Configuration file used by <command>ybin</command> to determine
- how to install <command>yaboot</command> on the bootstrap partition.</para>
- <indexterm zone="ch-system-yaboot yaboot.conf">
- <primary sortas="e-yaboot.conf">yaboot.conf</primary>
- </indexterm>
- </listitem>
- </varlistentry>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="../ppc/yaboot.xml"
+ xpointer="xpointer(//[EMAIL PROTECTED]'g'])"/>
- </variablelist>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="../ppc/yaboot.xml"
+ xpointer="xpointer(//[EMAIL PROTECTED]'h'])"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="../ppc/yaboot.xml"
+ xpointer="xpointer(//[EMAIL PROTECTED]'i'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="../ppc/yaboot.xml"
+ xpointer="xpointer(//[EMAIL PROTECTED]'j'])"/>
+
</sect2>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="../ppc/yaboot.xml"
+ xpointer="xpointer(id('contents-yaboot'))"/>
+
</sect1>
Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent 2006-05-10 16:32:14 UTC (rev 1548)
+++ trunk/BOOK/general.ent 2006-05-10 16:56:16 UTC (rev 1549)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "CLFS-SVN-20060509">
+<!ENTITY version "CLFS-SVN-20060510">
<!ENTITY version-x86 "&version;-x86">
<!ENTITY version-x86_64 "&version;-x86_64-Multilib">
<!ENTITY version-x86_64-64 "&version;-x86_64-Pure64">
@@ -15,7 +15,7 @@
<!ENTITY version-mips64-64 "&version;-MIPS64-Pure64">
<!ENTITY version-alpha "&version;-ALPHA">
-<!ENTITY releasedate "May 9, 2006">
+<!ENTITY releasedate "May 10, 2006">
<!ENTITY milestone "0.1">
<!ENTITY generic-version "svn"> <!-- Use "svn", "testing", or "x.y[-pre{x}]"
-->
Modified: trunk/BOOK/introduction/ppc/changelog.xml
===================================================================
--- trunk/BOOK/introduction/ppc/changelog.xml 2006-05-10 16:32:14 UTC (rev
1548)
+++ trunk/BOOK/introduction/ppc/changelog.xml 2006-05-10 16:56:16 UTC (rev
1549)
@@ -34,6 +34,15 @@
-->
<listitem>
+ <para>May 10, 2006</para>
+ <itemizedlist>
+ <listitem>
+ <para>[ken] - Include the SATA patch for yaboot.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>April 27, 2006</para>
<itemizedlist>
<listitem>
Modified: trunk/BOOK/introduction/ppc64/changelog.xml
===================================================================
--- trunk/BOOK/introduction/ppc64/changelog.xml 2006-05-10 16:32:14 UTC (rev
1548)
+++ trunk/BOOK/introduction/ppc64/changelog.xml 2006-05-10 16:56:16 UTC (rev
1549)
@@ -34,6 +34,15 @@
-->
<listitem>
+ <para>May 10, 2006</para>
+ <itemizedlist>
+ <listitem>
+ <para>[ken] - Make yaboot build in the final system.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>May 9, 2006</para>
<itemizedlist>
<listitem>
Modified: trunk/BOOK/materials/ppc/patches.xml
===================================================================
--- trunk/BOOK/materials/ppc/patches.xml 2006-05-10 16:32:14 UTC (rev
1548)
+++ trunk/BOOK/materials/ppc/patches.xml 2006-05-10 16:56:16 UTC (rev
1549)
@@ -17,7 +17,7 @@
xpointer="xpointer(//[EMAIL PROTECTED]'gcc-specs-patch'])"/>
<varlistentry>
- <term>Powerpc-utils_(&powerpcutils-version;) - 21 KB:</term>
+ <term>Powerpc-utils_(&powerpcutils-version;) Fixes Patch - 21 KB:</term>
<listitem>
<para><ulink
url="&patches-root;powerpc-utils/&powerpcutils-patch;"/></para>
@@ -25,13 +25,21 @@
</varlistentry>
<varlistentry>
- <term>Yaboot (&yaboot-version;) - 1 KB:</term>
+ <term>Yaboot (&yaboot-version;) Fixes Patch - 1 KB:</term>
<listitem>
<para><ulink
url="&patches-root;yaboot/&yaboot-fix-patch;"/></para>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term>Yaboot (&yaboot-version;) SATA Patch - 1 KB:</term>
+ <listitem>
+ <para><ulink
+ url="&patches-root;yaboot/&yaboot-sata-patch;"/></para>
+ </listitem>
+ </varlistentry>
+
</variablelist>
</sect1>
Modified: trunk/BOOK/materials/ppc64/patches.xml
===================================================================
--- trunk/BOOK/materials/ppc64/patches.xml 2006-05-10 16:32:14 UTC (rev
1548)
+++ trunk/BOOK/materials/ppc64/patches.xml 2006-05-10 16:56:16 UTC (rev
1549)
@@ -21,7 +21,7 @@
xpointer="xpointer(//[EMAIL PROTECTED]'gcc-specs-patch'])"/>
<varlistentry>
- <term>Powerpc-utils_(&powerpcutils-version;) - 21 KB:</term>
+ <term>Powerpc-utils_(&powerpcutils-version;) Fixes Patch - 21 KB:</term>
<listitem>
<para><ulink
url="&patches-root;powerpc-utils/&powerpcutils64-patch;"/></para>
@@ -29,13 +29,21 @@
</varlistentry>
<varlistentry>
- <term>Yaboot (&yaboot-version;) - 1 KB:</term>
+ <term>Yaboot (&yaboot-version;) Fixes Patch - 1 KB:</term>
<listitem>
<para><ulink
url="&patches-root;yaboot/&yaboot-fix-patch;"/></para>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term>Yaboot (&yaboot-version;) SATA Patch - 1 KB:</term>
+ <listitem>
+ <para><ulink
+ url="&patches-root;yaboot/&yaboot-sata-patch;"/></para>
+ </listitem>
+ </varlistentry>
+
</variablelist>
</sect1>
Modified: trunk/BOOK/patches.ent
===================================================================
--- trunk/BOOK/patches.ent 2006-05-10 16:32:14 UTC (rev 1548)
+++ trunk/BOOK/patches.ent 2006-05-10 16:56:16 UTC (rev 1549)
@@ -72,15 +72,16 @@
<!ENTITY lilo-cross-x86_64-patch
"lilo-&lilo-version;-cross_compile_x86_64-1.patch">
-<!-- Start of ppc patches -->
+<!-- Start of ppc/ppc64 patches -->
<!ENTITY powerpcutils-patch
"powerpc-utils_&powerpcutils-version;-fixes-1.patch">
+<!ENTITY powerpcutils64-patch
"powerpc-utils_&powerpcutils-version;-fixes-2.patch">
+
<!ENTITY yaboot-fix-patch "yaboot-&yaboot-version;-fix-1.patch">
-<!-- Start of ppc64 patches -->
+<!ENTITY yaboot-sata-patch "yaboot-&yaboot-version;-ofpath_sata-1.patch">
-<!ENTITY powerpcutils64-patch
"powerpc-utils_&powerpcutils-version;-fixes-2.patch">
<!-- Start of sparc/sparc64 patches -->
Modified: trunk/BOOK/stylesheets/top-index.xsl
===================================================================
--- trunk/BOOK/stylesheets/top-index.xsl 2006-05-10 16:32:14 UTC (rev
1548)
+++ trunk/BOOK/stylesheets/top-index.xsl 2006-05-10 16:56:16 UTC (rev
1549)
@@ -201,10 +201,6 @@
</a>
</h4>
</li>
- <br />
- <h3>
- <xsl:text>Working from chroot, except for the bootloader.
Development in progress.</xsl:text>
- </h3>
<li>
<h4>
<a href="ppc64">
--
http://linuxfromscratch.org/mailman/listinfo/cross-lfs
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
