r993 - in trunk/BOOK: . boot/sparc final-system final-system/sparc final-system/sparc64 final-system/sparc64-64 introduction/sparc introduction/sparc64 introduction/sparc64-64 materials/sparc materials/sparc64 materials/sparc64-64 materials/sparcv8

jim at linuxfromscratch.org jim at linuxfromscratch.org
Tue Jan 3 15:33:18 PST 2006


Author: jim
Date: 2006-01-03 16:33:16 -0700 (Tue, 03 Jan 2006)
New Revision: 993

Added:
   trunk/BOOK/final-system/sparc64-64/silo.xml
Removed:
   trunk/BOOK/final-system/sparc64-64/elftoaout.xml
Modified:
   trunk/BOOK/
   trunk/BOOK/boot/sparc/elftoaout.xml
   trunk/BOOK/final-system/sparc/elftoaout.xml
   trunk/BOOK/final-system/sparc64-64-chapter.xml
   trunk/BOOK/final-system/sparc64/elftoaout.xml
   trunk/BOOK/introduction/sparc/changelog.xml
   trunk/BOOK/introduction/sparc64-64/changelog.xml
   trunk/BOOK/introduction/sparc64/changelog.xml
   trunk/BOOK/materials/sparc/patches.xml
   trunk/BOOK/materials/sparc64-64/patches.xml
   trunk/BOOK/materials/sparc64/patches.xml
   trunk/BOOK/materials/sparcv8/patches.xml
   trunk/BOOK/patches.ent
Log:
 r1257 at server:  jim | 2006-01-03 15:30:34 -0800
 Elftoaout and Silo Fixes



Property changes on: trunk/BOOK
___________________________________________________________________
Name: svk:merge
   - 3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1252
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790
   + 3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1257
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790

Modified: trunk/BOOK/boot/sparc/elftoaout.xml
===================================================================
--- trunk/BOOK/boot/sparc/elftoaout.xml	2006-01-03 20:07:10 UTC (rev 992)
+++ trunk/BOOK/boot/sparc/elftoaout.xml	2006-01-03 23:33:16 UTC (rev 993)
@@ -22,6 +22,14 @@
   <sect2 role="installation">
     <title>Installation of ELFtoaout</title>
 
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../../final-system/sparc/elftoaout.xml"
+  xpointer="xpointer(//*[@os='p1'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../../final-system/sparc/elftoaout.xml"
+  xpointer="xpointer(//*[@os='p2'])"/>
+
     <para>Compile the ELFtoaout package:</para>
 
 <screen><userinput>make</userinput></screen>

Modified: trunk/BOOK/final-system/sparc/elftoaout.xml
===================================================================
--- trunk/BOOK/final-system/sparc/elftoaout.xml	2006-01-03 20:07:10 UTC (rev 992)
+++ trunk/BOOK/final-system/sparc/elftoaout.xml	2006-01-03 23:33:16 UTC (rev 993)
@@ -32,14 +32,19 @@
   <sect2 role="installation">
     <title>Installation of ELFtoaout</title>
 
-    <para>Compile the ELFtoaout package:</para>
+    <para os="p1">The following patch fixes some 64 bit issues with
+    elftoaout:</para>
 
-<screen><userinput>make</userinput></screen>
+<screen os="p2"><userinput>patch -Np1 -i ../&elftoaout-fixes-patch;</userinput></screen>
 
-    <para>Install the package:</para>
+    <para os="a">Compile the ELFtoaout package:</para>
 
-<screen><userinput>make install</userinput></screen>
+<screen os="b"><userinput>make</userinput></screen>
 
+    <para os="c">Install the package:</para>
+
+<screen os="d"><userinput>make install</userinput></screen>
+
   </sect2>
 
   <sect2 id="contents-elftoaout" role="content">

Modified: trunk/BOOK/final-system/sparc64/elftoaout.xml
===================================================================
--- trunk/BOOK/final-system/sparc64/elftoaout.xml	2006-01-03 20:07:10 UTC (rev 992)
+++ trunk/BOOK/final-system/sparc64/elftoaout.xml	2006-01-03 23:33:16 UTC (rev 993)
@@ -21,12 +21,28 @@
   <sect2 role="installation">
     <title>Installation of ELFtoaout</title>
 
-    <para>Compile the ELFtoaout package:</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../sparc/elftoaout.xml"
+  xpointer="xpointer(//*[@os='p1'])"/>
 
-<screen><userinput>make CC="gcc ${BUILD32}"</userinput></screen>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../sparc/elftoaout.xml"
+  xpointer="xpointer(//*[@os='p2'])"/>
 
-    <para>Install the package:</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../sparc/elftoaout.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
 
+<screen os="b"><userinput>make CC="gcc ${BUILD64}</userinput></screen>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../sparc/elftoaout.xml"
+  xpointer="xpointer(//*[@os='c'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../sparc/elftoaout.xml"
+  xpointer="xpointer(//*[@os='d'])"/>
+
 <screen><userinput>make install</userinput></screen>
 
   </sect2>

Deleted: trunk/BOOK/final-system/sparc64-64/elftoaout.xml
===================================================================
--- trunk/BOOK/final-system/sparc64-64/elftoaout.xml	2006-01-03 20:07:10 UTC (rev 992)
+++ trunk/BOOK/final-system/sparc64-64/elftoaout.xml	2006-01-03 23:33:16 UTC (rev 993)
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-elftoaout" role="wrap">
-  <?dbhtml filename="elftoaout.html"?>
-
-  <title>ELFtoaout-&elftoaout-version;</title>
-
-  <indexterm zone="ch-system-elftoaout">
-    <primary sortas="a-ELFtoaout">ELFtoaout</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../sparc/elftoaout.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of ELFtoaout</title>
-
-    <para>Compile the ELFtoaout package:</para>
-
-<screen><userinput>make CC="gcc ${BUILD64}"</userinput></screen>
-
-    <para>Install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../sparc/elftoaout.xml"
-  xpointer="xpointer(id('contents-elftoaout'))"/>
-
-</sect1>

Added: trunk/BOOK/final-system/sparc64-64/silo.xml
===================================================================
--- trunk/BOOK/final-system/sparc64-64/silo.xml	2006-01-03 20:07:10 UTC (rev 992)
+++ trunk/BOOK/final-system/sparc64-64/silo.xml	2006-01-03 23:33:16 UTC (rev 993)
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-silo" role="wrap">
+  <?dbhtml filename="silo.html"?>
+
+  <title>Silo-&silo-version;</title>
+
+  <indexterm zone="ch-system-silo">
+    <primary sortas="a-Silo">Silo</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>The Silo package contains the Sparc Improved boot LOader.</para>
+
+    <segmentedlist>
+      <segtitle>&dependencies;</segtitle>
+
+      <seglistitem>
+      <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep,
+      Make, Ncurses, Sed, ELFtoaout</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Silo</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/silo.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/silo.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/silo.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/silo.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/silo.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+   <para os="f">Due to a compile issue with the current toolchains, we are going
+   to use the precompiled boot files. This is a temporary fix to the book, but
+   will give us a functional system. As soon as a fix is released, this section
+   will be removed. Here is how you install the precompiled files:</para>
+
+<screen os="g"><userinput>tar -xvf silo-loaders-&silo-version;.tar.gz -C /</userinput></screen>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../sparc/silo.xml"
+  xpointer="xpointer(id('contents-silo'))"/>
+
+</sect1>

Modified: trunk/BOOK/final-system/sparc64-64-chapter.xml
===================================================================
--- trunk/BOOK/final-system/sparc64-64-chapter.xml	2006-01-03 20:07:10 UTC (rev 992)
+++ trunk/BOOK/final-system/sparc64-64-chapter.xml	2006-01-03 23:33:16 UTC (rev 993)
@@ -62,7 +62,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/hotplug.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/elftoaout.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/elftoaout.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/silo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/aboutdebug.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/stripping.xml"/>

Modified: trunk/BOOK/introduction/sparc/changelog.xml
===================================================================
--- trunk/BOOK/introduction/sparc/changelog.xml	2006-01-03 20:07:10 UTC (rev 992)
+++ trunk/BOOK/introduction/sparc/changelog.xml	2006-01-03 23:33:16 UTC (rev 993)
@@ -40,6 +40,10 @@
           <para>[jim] - Silo builds correctly only if Silo and Elftoaout are built as
           32 Bit.</para>
         </listitem>
+        <listitem>
+          <para>[jim] - Elftoaout 64bit fixes are in place, we can now build Silo using
+	  a 64bit elftoaout. Thank you to the Linux-Sparc list, especially Dave Miller.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
 

Modified: trunk/BOOK/introduction/sparc64/changelog.xml
===================================================================
--- trunk/BOOK/introduction/sparc64/changelog.xml	2006-01-03 20:07:10 UTC (rev 992)
+++ trunk/BOOK/introduction/sparc64/changelog.xml	2006-01-03 23:33:16 UTC (rev 993)
@@ -40,6 +40,10 @@
           <para>[jim] - Silo builds correctly only if Silo and Elftoaout are built as
           32 Bit.</para>
         </listitem>
+        <listitem>
+          <para>[jim] - Elftoaout 64bit fixes are in place, we can now build Silo using
+          a 64bit elftoaout. Thank you to the Linux-Sparc list, especially Dave Miller.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
 

Modified: trunk/BOOK/introduction/sparc64-64/changelog.xml
===================================================================
--- trunk/BOOK/introduction/sparc64-64/changelog.xml	2006-01-03 20:07:10 UTC (rev 992)
+++ trunk/BOOK/introduction/sparc64-64/changelog.xml	2006-01-03 23:33:16 UTC (rev 993)
@@ -39,6 +39,10 @@
         <listitem>
           <para>[jim] - Added patch to fix Binutils Sparc aout usage.</para>
         </listitem>
+        <listitem>
+          <para>[jim] - Elftoaout 64bit fixes are in place, we can now build Silo using
+          a 64bit elftoaout. Thank you to the Linux-Sparc list, especially Dave Miller.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
 

Modified: trunk/BOOK/materials/sparc/patches.xml
===================================================================
--- trunk/BOOK/materials/sparc/patches.xml	2006-01-03 20:07:10 UTC (rev 992)
+++ trunk/BOOK/materials/sparc/patches.xml	2006-01-03 23:33:16 UTC (rev 993)
@@ -28,6 +28,14 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry os="elftoaout-fixes-patch">
+      <term>Elftoaout Fixes Patch - 6.7 KB:</term>
+      <listitem>
+        <para><ulink
+        url="&patches-root;elftoaout/&elftoaout-fixes-patch;"/></para>
+      </listitem>
+    </varlistentry>
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/patches.xml"
     xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>

Modified: trunk/BOOK/materials/sparc64/patches.xml
===================================================================
--- trunk/BOOK/materials/sparc64/patches.xml	2006-01-03 20:07:10 UTC (rev 992)
+++ trunk/BOOK/materials/sparc64/patches.xml	2006-01-03 23:33:16 UTC (rev 993)
@@ -25,6 +25,10 @@
     xpointer="xpointer(//*[@os='binutils-sparc_tls-patch'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/patches.xml"
+    xpointer="xpointer(//*[@os='elftoaout-fixes-patch'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/patches.xml"
     xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
 

Modified: trunk/BOOK/materials/sparc64-64/patches.xml
===================================================================
--- trunk/BOOK/materials/sparc64-64/patches.xml	2006-01-03 20:07:10 UTC (rev 992)
+++ trunk/BOOK/materials/sparc64-64/patches.xml	2006-01-03 23:33:16 UTC (rev 993)
@@ -21,6 +21,10 @@
     xpointer="xpointer(//*[@os='binutils-sparc_tls-patch'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/patches.xml"
+    xpointer="xpointer(//*[@os='elftoaout-fixes-patch'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86_64-64/patches.xml"
     xpointer="xpointer(//*[@os='gcc-pure64-patch'])"/>
 

Modified: trunk/BOOK/materials/sparcv8/patches.xml
===================================================================
--- trunk/BOOK/materials/sparcv8/patches.xml	2006-01-03 20:07:10 UTC (rev 992)
+++ trunk/BOOK/materials/sparcv8/patches.xml	2006-01-03 23:33:16 UTC (rev 993)
@@ -17,6 +17,10 @@
     xpointer="xpointer(//*[@os='binutils-sparc_aout-patch'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/patches.xml"
+    xpointer="xpointer(//*[@os='elftoaout-fixes-patch'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/patches.xml"
     xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
 

Modified: trunk/BOOK/patches.ent
===================================================================
--- trunk/BOOK/patches.ent	2006-01-03 20:07:10 UTC (rev 992)
+++ trunk/BOOK/patches.ent	2006-01-03 23:33:16 UTC (rev 993)
@@ -82,6 +82,8 @@
 <!ENTITY binutils-sparc_tls-patch "binutils-&binutils-version;-sparc_tls-1.patch">
 <!ENTITY binutils-sparc_aout-patch "binutils-&binutils-version;-sparc_aout-1.patch">
 
+<!ENTITY elftoaout-fixes-patch "elftoaout-&elftoaout-version;-64bit_fixes-1.patch">
+
 <!ENTITY glibc-sparc_tls-patch "glibc-&glibc-version;-sparc_tls-1.patch">
 <!ENTITY glibc-sparc_gcc4_fixes-patch "glibc-&glibc-linuxthreads-version;-sparc_gcc4_fixes-1.patch">
 




More information about the cross-lfs mailing list