Changeset 2533bdfd

Timestamp:

Feb 21, 2006, 2:00:14 AM (18 years ago)

Author:

Jim Gifford <clfs@…>

Children:

6db8b2c

Parents:

0869232

Message:

r993@server (orig r991): jim | 2006-01-03 09:01:31 -0800

r1252@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

Files:

• boot/sparc/silo-build.xml (modified) (1 diff)
• boot/sparc64-64/silo-build.xml (added)
• final-system/sparc/silo.xml (modified) (1 diff)
• final-system/sparc64-64-chapter.xml (modified) (1 diff)
• final-system/sparc64-64/elftoaout.xml (added)
• final-system/sparc64/elftoaout.xml (modified) (1 diff)
• final-system/sparc64/silo.xml (modified) (1 diff)
• introduction/common/changelog.xml (modified) (1 diff)
• introduction/sparc/changelog.xml (modified) (1 diff)
• introduction/sparc64/changelog.xml (modified) (1 diff)

boot/sparc/silo-build.xml

@@ -41 +41 @@
     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>
 

final-system/sparc/silo.xml

@@ -46 +46 @@
 <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>
 

final-system/sparc64-64-chapter.xml

@@ -63 +63 @@
   <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"/>

final-system/sparc64/elftoaout.xml

@@ -24 +24 @@
     <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>

final-system/sparc64/silo.xml

@@ -44 +44 @@
     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>
 

introduction/common/changelog.xml

@@ -36 +36 @@
     </listitem>
 -->
+
     <listitem>
       <para>December 30, 2005</para>

introduction/sparc/changelog.xml

@@ -35 +35 @@
 
     <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>

introduction/sparc64/changelog.xml

@@ -33 +33 @@
 
 -->
+
+    <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>