r5330 - in branches/cross-lfs/BOOK: . reboot reboot/common reboot/raq2 reboot/sparc64

jim at linuxfromscratch.org jim at linuxfromscratch.org
Fri May 13 09:52:37 PDT 2005


Author: jim
Date: 2005-05-13 10:52:36 -0600 (Fri, 13 May 2005)
New Revision: 5330

Added:
   branches/cross-lfs/BOOK/reboot/sparc64/silo.xml
Modified:
   branches/cross-lfs/BOOK/Makefile
   branches/cross-lfs/BOOK/general.ent
   branches/cross-lfs/BOOK/reboot/common/sysvinit.xml
   branches/cross-lfs/BOOK/reboot/raq2/colo-build.xml
   branches/cross-lfs/BOOK/reboot/raq2/sysvinit.xml
   branches/cross-lfs/BOOK/reboot/sparc64-chapter.xml
Log:
Added missing silo to reboot sparc64
Updated variables in colo-build and sysvinit
Updated Udev to 057


Modified: branches/cross-lfs/BOOK/Makefile
===================================================================
--- branches/cross-lfs/BOOK/Makefile	2005-05-13 16:47:51 UTC (rev 5329)
+++ branches/cross-lfs/BOOK/Makefile	2005-05-13 16:52:36 UTC (rev 5330)
@@ -19,22 +19,32 @@
 	cd $(BASEDIR)/$$arch/; sed -i -e "s at ../images at images@g" *.html
 endef
 
+# HTML Rendering No Chunks
+define HTML_RENDER2
+	echo "Rendering Single File HTML of $$arch..." ; \
+	xsltproc --xinclude --nonet -stringparam profile.condition html \
+	   --output $(BASEDIR)/LFS-BOOK-$$arch.html \
+	   $(PWD)/stylesheets/lfs-nochunks.xsl $$arch-index.xml
+endef
+
 # PDF Rendering
 define PDF_RENDER
 	echo "Rendering PDF of $$arch..." ; \
         xsltproc --xinclude --nonet --output $(BASEDIR)/lfs-pdf.fo \
                 $(PWD)/stylesheets/lfs-pdf.xsl $$arch-index.xml ; \
         sed -i -e "s/inherit/all/" $(BASEDIR)/lfs-pdf.fo ; \
-        fop.sh $(BASEDIR)/lfs-pdf.fo $(BASEDIR)/LFS-BOOK-$$arch.pdf ; \
+        fop.sh $(BASEDIR)/lfs-pdf.fo -pdf $(BASEDIR)/LFS-BOOK-$$arch.pdf ; \
         rm $(BASEDIR)/lfs-pdf.fo
 endef
 
-# HTML Rendering No Chunks
-define HTML_RENDER2
-	echo "Rendering Single File HTML of $$arch..." ; \
-	xsltproc --xinclude --nonet -stringparam profile.condition html \
-	   --output $(BASEDIR)/LFS-BOOK-$$arch.html \
-	   $(PWD)/stylesheets/lfs-nochunks.xsl $$arch-index.xml
+# Plain Text Rendering
+define TEXT_RENDER
+        echo "Rendering Text of $$arch..." ; \
+        xsltproc --xinclude --nonet --output $(BASEDIR)/lfs-pdf.fo \
+                $(PWD)/stylesheets/lfs-pdf.xsl $$arch-index.xml ; \
+        sed -i -e "s/inherit/all/" $(BASEDIR)/lfs-pdf.fo ; \
+        fop.sh $(BASEDIR)/lfs-pdf.fo -txt $(BASEDIR)/LFS-BOOK-$$arch.txt ; \
+        rm $(BASEDIR)/lfs-pdf.fo
 endef
 
 # Validation
@@ -78,6 +88,11 @@
 	$(PDF_RENDER) ; \
 	done
 
+text:
+	@for arch in $(ARCH) ; do \
+	$(TEXT_RENDER) ; \
+	done
+
 validate: validation cleanup
 
 validation:
@@ -91,4 +106,4 @@
 	rm -f $(PWD)/index-$$arch.xml ; \
 	done
 
-.PHONY: lfs toplevel common render nochunk nochunk nochunk_render validate validation cleanup
+.PHONY: lfs toplevel common render nochunk nochunk nochunk_render pdf text validate validation cleanup

Modified: branches/cross-lfs/BOOK/general.ent
===================================================================
--- branches/cross-lfs/BOOK/general.ent	2005-05-13 16:47:51 UTC (rev 5329)
+++ branches/cross-lfs/BOOK/general.ent	2005-05-13 16:52:36 UTC (rev 5330)
@@ -96,7 +96,7 @@
 <!ENTITY tcl-version "8.4.9">
 <!ENTITY texinfo-version "4.8">
 <!ENTITY util-linux-version "2.12q">
-<!ENTITY udev-version "056">
+<!ENTITY udev-version "057">
 <!ENTITY yaboot-version "1.3.13">
 <!ENTITY vim-version "6.3">
 <!ENTITY zlib-version "1.2.2">

Modified: branches/cross-lfs/BOOK/reboot/common/sysvinit.xml
===================================================================
--- branches/cross-lfs/BOOK/reboot/common/sysvinit.xml	2005-05-13 16:47:51 UTC (rev 5329)
+++ branches/cross-lfs/BOOK/reboot/common/sysvinit.xml	2005-05-13 16:52:36 UTC (rev 5330)
@@ -56,7 +56,7 @@
 <para>Compile the package:</para>
 
 <screen><userinput>make -C src clobber
-make -C src CC="${LFS_TARGET}-gcc" LDFLAGS="-s"</userinput></screen>
+make -C src CC="${CC}" LDFLAGS="-s"</userinput></screen>
 
 <para>Install the package:</para>
 

Modified: branches/cross-lfs/BOOK/reboot/raq2/colo-build.xml
===================================================================
--- branches/cross-lfs/BOOK/reboot/raq2/colo-build.xml	2005-05-13 16:47:51 UTC (rev 5329)
+++ branches/cross-lfs/BOOK/reboot/raq2/colo-build.xml	2005-05-13 16:52:36 UTC (rev 5330)
@@ -33,7 +33,7 @@
 
 <para>Compile the Colo package:</para>
 
-<screen><userinput>make</userinput></screen>
+<screen><userinput>make CROSS_COMPILE="${LFS_TARGET}-"</userinput></screen>
 
 <para>Install the package:</para>
 

Modified: branches/cross-lfs/BOOK/reboot/raq2/sysvinit.xml
===================================================================
--- branches/cross-lfs/BOOK/reboot/raq2/sysvinit.xml	2005-05-13 16:47:51 UTC (rev 5329)
+++ branches/cross-lfs/BOOK/reboot/raq2/sysvinit.xml	2005-05-13 16:52:36 UTC (rev 5330)
@@ -56,7 +56,7 @@
 <para>Compile the package:</para>
 
 <screen><userinput>make -C src clobber
-make -C src CC="${LFS_TARGET}-gcc" LDFLAGS="-s"</userinput></screen>
+make -C src CC="${CC}" LDFLAGS="-s"</userinput></screen>
 
 <para>Install the package:</para>
 

Added: branches/cross-lfs/BOOK/reboot/sparc64/silo.xml
===================================================================
--- branches/cross-lfs/BOOK/reboot/sparc64/silo.xml	2005-05-13 16:47:51 UTC (rev 5329)
+++ branches/cross-lfs/BOOK/reboot/sparc64/silo.xml	2005-05-13 16:52:36 UTC (rev 5330)
@@ -0,0 +1,44 @@
+<?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-reboot-silo" role="wrap">
+<title>Silo-&silo-version;</title>
+<?dbhtml filename="silo.html"?>
+
+<indexterm zone="ch-reboot-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>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.2 SBU</seg><seg>10 MB</seg></seglistitem>
+</segmentedlist>
+
+<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>
+
+<para>Compile the Silo package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>Install the package:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+</sect2>
+
+</sect1>

Modified: branches/cross-lfs/BOOK/reboot/sparc64-chapter.xml
===================================================================
--- branches/cross-lfs/BOOK/reboot/sparc64-chapter.xml	2005-05-13 16:47:51 UTC (rev 5329)
+++ branches/cross-lfs/BOOK/reboot/sparc64-chapter.xml	2005-05-13 16:52:36 UTC (rev 5330)
@@ -18,6 +18,6 @@
 <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.xml"/> -->
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/silo.xml"/>
 
 </chapter>




More information about the lfs-book mailing list