r6643 - in branches/cross-lfs/BOOK: . boot boot/sparc boot/sparc64 boot/sparc64-64 final-system/sparc final-system/sparc64 introduction/sparc

jim at linuxfromscratch.org jim at linuxfromscratch.org
Wed Aug 10 00:15:42 PDT 2005


Author: jim
Date: 2005-08-10 01:15:39 -0600 (Wed, 10 Aug 2005)
New Revision: 6643

Added:
   branches/cross-lfs/BOOK/boot/sparc64-64/silo-build.xml
   branches/cross-lfs/BOOK/boot/sparc64-64/silo.xml
Modified:
   branches/cross-lfs/BOOK/
   branches/cross-lfs/BOOK/boot/sparc/silo-build.xml
   branches/cross-lfs/BOOK/boot/sparc64-64-chapter.xml
   branches/cross-lfs/BOOK/boot/sparc64/silo-build.xml
   branches/cross-lfs/BOOK/boot/sparc64/silo.xml
   branches/cross-lfs/BOOK/final-system/sparc/silo.xml
   branches/cross-lfs/BOOK/final-system/sparc64/silo.xml
   branches/cross-lfs/BOOK/introduction/sparc/changelog.xml
   branches/cross-lfs/BOOK/patches.ent
Log:
 r7080 at server:  jim | 2005-08-10 00:15:16 -0700
 Silo fixed for 32 bit builds, 64 still a challenge



Property changes on: branches/cross-lfs/BOOK
___________________________________________________________________
Name: svk:merge
   - 7321b066-45f8-0310-a5e2-f63eff31be55:/cross-lfs:7078
dfc39d96-41f8-0310-9e44-b84af8e7c7f6:/books/local:5516
   + 7321b066-45f8-0310-a5e2-f63eff31be55:/cross-lfs:7080
dfc39d96-41f8-0310-9e44-b84af8e7c7f6:/books/local:5516

Modified: branches/cross-lfs/BOOK/boot/sparc/silo-build.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/sparc/silo-build.xml	2005-08-09 18:59:37 UTC (rev 6642)
+++ branches/cross-lfs/BOOK/boot/sparc/silo-build.xml	2005-08-10 07:15:39 UTC (rev 6643)
@@ -55,13 +55,6 @@
 
 <screen><userinput>make install DESTDIR=${LFS}</userinput></screen>
 
-   <para>Do to an 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><userinput>tar -xvf silo-loaders-&silo-version;.tar.gz -C ${LFS}</userinput></screen>
-
   </sect2>
 
   <sect2 role="content">

Modified: branches/cross-lfs/BOOK/boot/sparc64/silo-build.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/sparc64/silo-build.xml	2005-08-09 18:59:37 UTC (rev 6642)
+++ branches/cross-lfs/BOOK/boot/sparc64/silo-build.xml	2005-08-10 07:15:39 UTC (rev 6643)
@@ -49,19 +49,12 @@
 
     <para>Compile the Silo package:</para>
 
-<screen><userinput>make CROSS_COMPILE="sparc64-unknown-linux-gnu-" CC="${CC} ${BUILD64}" LD=${LD}</userinput></screen>
+<screen><userinput>make CROSS_COMPILE="sparc64-unknown-linux-gnu-"</userinput></screen>
 
     <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
 
-   <para>Do to an 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><userinput>tar -xvf silo-loaders-&silo-version;.tar.gz -C ${LFS}</userinput></screen>
-
   </sect2>
 
   <sect2 role="content">

Modified: branches/cross-lfs/BOOK/boot/sparc64/silo.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/sparc64/silo.xml	2005-08-09 18:59:37 UTC (rev 6642)
+++ branches/cross-lfs/BOOK/boot/sparc64/silo.xml	2005-08-10 07:15:39 UTC (rev 6643)
@@ -28,4 +28,13 @@
   label = linux
 # End /etc/silo.conf</literal></userinput></screen>
 
+   <para>If you already have Silo installed on your target system, you do not
+   need to reinstall it. Silo is just a chain loader and has no bearing on the
+   system build.</para>
+
+   <para>After you get the build copied to when you can boot, you will need to
+   issue the following command:</para>
+
+<screen><userinput>silo -f</userinput></screen>
+
 </sect1>

Added: branches/cross-lfs/BOOK/boot/sparc64-64/silo-build.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/sparc64-64/silo-build.xml	2005-08-09 18:59:37 UTC (rev 6642)
+++ branches/cross-lfs/BOOK/boot/sparc64-64/silo-build.xml	2005-08-10 07:15:39 UTC (rev 6643)
@@ -0,0 +1,68 @@
+<?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">
+  <!ENTITY % patches-entities SYSTEM "../../patches.ent">
+  %general-entities;
+  %patches-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>
+
+  <sect2 role="package">
+    <title/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/sparc/silo.xml"
+    xpointer="xpointer(id('package-silo')/para[1])"/>
+
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
+
+      <seglistitem>
+        <seg>Not checked yet</seg>
+        <seg>Not checked yet</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/sparc/silo.xml"
+    xpointer="xpointer(id('package-silo')/segmentedlist[2])"/>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Silo</title>
+
+    <para>The following patch fixes compile issues::</para>
+
+<screen><userinput>patch -Np1 -i ../&silo-sparc64_fixes-patch;</userinput></screen>
+
+    <para>Compile the Silo package:</para>
+
+<screen><userinput>make CROSS_COMPILE="sparc64-unknown-linux-gnu-"</userinput></screen>
+
+    <para>Install the package:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-silo" role="."/></para>
+
+  </sect2>
+
+</sect1>

Added: branches/cross-lfs/BOOK/boot/sparc64-64/silo.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/sparc64-64/silo.xml	2005-08-09 18:59:37 UTC (rev 6642)
+++ branches/cross-lfs/BOOK/boot/sparc64-64/silo.xml	2005-08-10 07:15:39 UTC (rev 6643)
@@ -0,0 +1,40 @@
+<?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" role="wrap">
+  <?dbhtml filename="silo.html"?>
+
+  <title>Making the Temporary System Bootable</title>
+
+  <indexterm zone="ch-boot-silo">
+    <primary sortas="a-Silo">Silo</primary>
+    <secondary>boot, configuring</secondary>
+  </indexterm>
+
+  <para>This is for the configuration of silo, similar to what
+  is in bootscripts.</para>
+
+<screen><userinput>cat > ${LFS}/etc/silo.conf << "EOF"
+<literal># Begin /etc/silo.conf
+partition = 1         # Boot partition (= root partition)
+root = /dev/sda1      # Root partition
+timeout = 150         # Wait 15 seconds before booting the default section
+
+image = /boot/lfskernel-&linux-sparc64-version;
+  label = linux
+# End /etc/silo.conf</literal></userinput></screen>
+
+   <para>If you already have Silo installed on your target system, you do not
+   need to reinstall it. Silo is just a chain loader and has no bearing on the
+   system build.</para>
+
+   <para>After you get the build copied to when you can boot, you will need to
+   issue the following command:</para>
+
+<screen><userinput>silo -f</userinput></screen>
+
+</sect1>

Modified: branches/cross-lfs/BOOK/boot/sparc64-64-chapter.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/sparc64-64-chapter.xml	2005-08-09 18:59:37 UTC (rev 6642)
+++ branches/cross-lfs/BOOK/boot/sparc64-64-chapter.xml	2005-08-10 07:15:39 UTC (rev 6643)
@@ -23,13 +23,13 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/createfiles.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pwdgroup.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/silo-build.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/silo-build.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/settingenviron.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/fstab.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/silo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/silo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/whatnext.xml"/>
 
 </chapter>

Modified: branches/cross-lfs/BOOK/final-system/sparc/silo.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/sparc/silo.xml	2005-08-09 18:59:37 UTC (rev 6642)
+++ branches/cross-lfs/BOOK/final-system/sparc/silo.xml	2005-08-10 07:15:39 UTC (rev 6643)
@@ -57,13 +57,6 @@
 
 <screen><userinput>make install</userinput></screen>
 
-   <para>Do to an 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><userinput>tar -xvf silo-loaders-&silo-version;.tar.gz -C /</userinput></screen>
-
   </sect2>
 
   <sect2 id="contents-silo" role="content">

Modified: branches/cross-lfs/BOOK/final-system/sparc64/silo.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/sparc64/silo.xml	2005-08-09 18:59:37 UTC (rev 6642)
+++ branches/cross-lfs/BOOK/final-system/sparc64/silo.xml	2005-08-10 07:15:39 UTC (rev 6643)
@@ -57,13 +57,6 @@
 
 <screen><userinput>make install</userinput></screen>
 
-   <para>Do to an 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><userinput>tar -xvf silo-loaders-&silo-version;.tar.gz -C /</userinput></screen>
-
   </sect2>
 
   <sect2 id="contents-silo" role="content">

Modified: branches/cross-lfs/BOOK/introduction/sparc/changelog.xml
===================================================================
--- branches/cross-lfs/BOOK/introduction/sparc/changelog.xml	2005-08-09 18:59:37 UTC (rev 6642)
+++ branches/cross-lfs/BOOK/introduction/sparc/changelog.xml	2005-08-10 07:15:39 UTC (rev 6643)
@@ -79,6 +79,16 @@
 -->
 
     <listitem>
+      <para>August 9, 2005</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Got Silo to build on 32 bit, without the precompiled
+          boot files.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>August 8, 2005</para>
       <itemizedlist>
         <listitem>

Modified: branches/cross-lfs/BOOK/patches.ent
===================================================================
--- branches/cross-lfs/BOOK/patches.ent	2005-08-09 18:59:37 UTC (rev 6642)
+++ branches/cross-lfs/BOOK/patches.ent	2005-08-10 07:15:39 UTC (rev 6643)
@@ -66,7 +66,7 @@
 
 <!ENTITY netkit_base-fixes-patch "netkit-base-&netkit_base-version;-fixes-1.patch">
 
-<!ENTITY silo-fixes-patch "silo-&silo-version;-fixes-2.patch">
+<!ENTITY silo-fixes-patch "silo-&silo-version;-fixes-3.patch">
 <!ENTITY silo-sparc64_fixes-patch "silo-&silo-version;-sparc64_fixes-1.patch">
 
 <!-- Start of mips/mips64 patches -->




More information about the lfs-book mailing list