r991 - in trunk/BOOK: . boot/sparc boot/sparc64-64 final-system final-system/sparc final-system/sparc64 final-system/sparc64-64 introduction/common introduction/sparc introduction/sparc64

jim at linuxfromscratch.org jim at linuxfromscratch.org
Tue Jan 3 09:01:33 PST 2006


Author: jim
Date: 2006-01-03 10:01:31 -0700 (Tue, 03 Jan 2006)
New Revision: 991

Added:
   trunk/BOOK/boot/sparc64-64/silo-build.xml
   trunk/BOOK/final-system/sparc64-64/elftoaout.xml
Modified:
   trunk/BOOK/
   trunk/BOOK/boot/sparc/silo-build.xml
   trunk/BOOK/final-system/sparc/silo.xml
   trunk/BOOK/final-system/sparc64-64-chapter.xml
   trunk/BOOK/final-system/sparc64/elftoaout.xml
   trunk/BOOK/final-system/sparc64/silo.xml
   trunk/BOOK/introduction/common/changelog.xml
   trunk/BOOK/introduction/sparc/changelog.xml
   trunk/BOOK/introduction/sparc64/changelog.xml
Log:
 r1252 at server:  jim | 2006-01-03 08:55:16 -0800
 Fixed Silo Build, only will build if Silo and Elftoaout are 32 Bit. 64 Bit build needs to be looked at



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

Modified: trunk/BOOK/boot/sparc/silo-build.xml
===================================================================
--- trunk/BOOK/boot/sparc/silo-build.xml	2006-01-03 17:01:23 UTC (rev 990)
+++ trunk/BOOK/boot/sparc/silo-build.xml	2006-01-03 17:01:31 UTC (rev 991)
@@ -40,14 +40,6 @@
     href="../../final-system/sparc/silo.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
-<screen os="ab"><userinput>make install DESTDIR=${LFS}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc/silo.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-<screen os="ac"><userinput>tar -xvf silo-loaders-&silo-version;.tar.gz -C ${LFS}</userinput></screen>
-
   </sect2>
 
   <sect2 role="content">

Added: trunk/BOOK/boot/sparc64-64/silo-build.xml
===================================================================
--- trunk/BOOK/boot/sparc64-64/silo-build.xml	2006-01-03 17:01:23 UTC (rev 990)
+++ trunk/BOOK/boot/sparc64-64/silo-build.xml	2006-01-03 17:01:31 UTC (rev 991)
@@ -0,0 +1,61 @@
+<?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-boot-silo-build" role="wrap">
+  <?dbhtml filename="silo-build.html"?>
+
+  <title>Silo-&silo-version;</title>
+
+  <indexterm zone="ch-boot-silo-build">
+    <primary sortas="a-Silo">Silo</primary>
+    <secondary>boot</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../../final-system/sparc/silo.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Silo</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/sparc/silo.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/sparc/silo.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/sparc/silo.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+<screen os="aa"><userinput>make CROSS_COMPILE=${LFS_TARGET}-</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/sparc/silo.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+<screen os="ab"><userinput>make install DESTDIR=${LFS}</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/sparc/silo.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+<screen os="ac"><userinput>tar -xvf silo-loaders-&silo-version;.tar.gz -C ${LFS}</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-silo" role="."/></para>
+
+  </sect2>
+
+</sect1>

Modified: trunk/BOOK/final-system/sparc/silo.xml
===================================================================
--- trunk/BOOK/final-system/sparc/silo.xml	2006-01-03 17:01:23 UTC (rev 990)
+++ trunk/BOOK/final-system/sparc/silo.xml	2006-01-03 17:01:31 UTC (rev 991)
@@ -45,13 +45,6 @@
 
 <screen os="e"><userinput>make install</userinput></screen>
 
-   <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 ${LFS}</userinput></screen>
-
   </sect2>
 
   <sect2 id="contents-silo" role="content">

Modified: trunk/BOOK/final-system/sparc64/elftoaout.xml
===================================================================
--- trunk/BOOK/final-system/sparc64/elftoaout.xml	2006-01-03 17:01:23 UTC (rev 990)
+++ trunk/BOOK/final-system/sparc64/elftoaout.xml	2006-01-03 17:01:31 UTC (rev 991)
@@ -23,7 +23,7 @@
 
     <para>Compile the ELFtoaout package:</para>
 
-<screen><userinput>make CC="gcc ${BUILD64}"</userinput></screen>
+<screen><userinput>make CC="gcc ${BUILD32}"</userinput></screen>
 
     <para>Install the package:</para>
 

Modified: trunk/BOOK/final-system/sparc64/silo.xml
===================================================================
--- trunk/BOOK/final-system/sparc64/silo.xml	2006-01-03 17:01:23 UTC (rev 990)
+++ trunk/BOOK/final-system/sparc64/silo.xml	2006-01-03 17:01:31 UTC (rev 991)
@@ -43,14 +43,6 @@
     href="../sparc/silo.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/silo.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/silo.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Added: trunk/BOOK/final-system/sparc64-64/elftoaout.xml
===================================================================
--- trunk/BOOK/final-system/sparc64-64/elftoaout.xml	2006-01-03 17:01:23 UTC (rev 990)
+++ trunk/BOOK/final-system/sparc64-64/elftoaout.xml	2006-01-03 17:01:31 UTC (rev 991)
@@ -0,0 +1,38 @@
+<?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>

Modified: trunk/BOOK/final-system/sparc64-64-chapter.xml
===================================================================
--- trunk/BOOK/final-system/sparc64-64-chapter.xml	2006-01-03 17:01:23 UTC (rev 990)
+++ trunk/BOOK/final-system/sparc64-64-chapter.xml	2006-01-03 17:01:31 UTC (rev 991)
@@ -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="sparc/elftoaout.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="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/common/changelog.xml
===================================================================
--- trunk/BOOK/introduction/common/changelog.xml	2006-01-03 17:01:23 UTC (rev 990)
+++ trunk/BOOK/introduction/common/changelog.xml	2006-01-03 17:01:31 UTC (rev 991)
@@ -35,6 +35,7 @@
       </itemizedlist>
     </listitem>
 -->
+
     <listitem>
       <para>December 30, 2005</para>
       <itemizedlist>

Modified: trunk/BOOK/introduction/sparc/changelog.xml
===================================================================
--- trunk/BOOK/introduction/sparc/changelog.xml	2006-01-03 17:01:23 UTC (rev 990)
+++ trunk/BOOK/introduction/sparc/changelog.xml	2006-01-03 17:01:31 UTC (rev 991)
@@ -34,6 +34,16 @@
 -->
 
     <listitem>
+      <para>January 3, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Silo builds correctly only if Silo and Elftoaout are built as
+          32 Bit.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>January 2, 2006</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/introduction/sparc64/changelog.xml
===================================================================
--- trunk/BOOK/introduction/sparc64/changelog.xml	2006-01-03 17:01:23 UTC (rev 990)
+++ trunk/BOOK/introduction/sparc64/changelog.xml	2006-01-03 17:01:31 UTC (rev 991)
@@ -34,6 +34,16 @@
 -->
 
     <listitem>
+      <para>January 3, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Silo builds correctly only if Silo and Elftoaout are built as
+          32 Bit.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>January 2, 2006</para>
       <itemizedlist>
         <listitem>




More information about the cross-lfs mailing list