r5169 - in branches/cross-lfs/BOOK: . cross-tools introduction stylesheets

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Wed May 4 08:30:21 PDT 2005


Author: jhuntwork
Date: 2005-05-04 09:30:20 -0600 (Wed, 04 May 2005)
New Revision: 5169

Modified:
   branches/cross-lfs/BOOK/Makefile
   branches/cross-lfs/BOOK/cross-tools/glibc-headers.xml
   branches/cross-lfs/BOOK/cross-tools/linux-libc-headers-ppc.xml
   branches/cross-lfs/BOOK/general.ent
   branches/cross-lfs/BOOK/introduction/changelog.xml
   branches/cross-lfs/BOOK/stylesheets/top-index.xsl
Log:
Fixed CC variable used in glibc headers.
Added ppc specific info to glibc headers build.


Modified: branches/cross-lfs/BOOK/Makefile
===================================================================
--- branches/cross-lfs/BOOK/Makefile	2005-05-02 12:19:43 UTC (rev 5168)
+++ branches/cross-lfs/BOOK/Makefile	2005-05-04 15:30:20 UTC (rev 5169)
@@ -1,49 +1,18 @@
 BASEDIR=~/lfs-book
 CHUNK_QUIET=0
-PDF_OUTPUT=LFS-BOOK.pdf
-NOCHUNKS_OUTPUT=LFS-BOOK.html
+PDF_OUTPUT=LFS-BOOK-$(ARCH).pdf
+NOCHUNKS_OUTPUT=LFS-BOOK-$(ARCH).html
 XSLROOTDIR=/usr/share/xml/docbook/xsl-stylesheets-current
 ARCH=x86
 
-# --Setup to only make one arch, for testing of the cross-tools
-all: testing
-
-testing:
-	xsltproc --xinclude --nonet -stringparam profile.condition html -stringparam profile.arch x86 \
-	 -stringparam chunk.quietly $(CHUNK_QUIET)  -stringparam base.dir $(BASEDIR)/ \
-	stylesheets/lfs-chunked.xsl index.xml
-
-	if [ ! -e $(BASEDIR)/stylesheets ]; then \
-	 mkdir -p $(BASEDIR)/stylesheets; \
-	fi;
-	cp stylesheets/*.css $(BASEDIR)/stylesheets
-
-	if [ ! -e $(BASEDIR)/images ]; then \
-	 mkdir -p $(BASEDIR)/images; \
-	fi;
-	cp $(XSLROOTDIR)/images/*.png \
-	 $(BASEDIR)/images
-	cd $(BASEDIR)/; sed -i -e "s at ../stylesheets at stylesheets@g" \
-	 *.html
-	cd $(BASEDIR)/; sed -i -e "s at ../images at images@g" \
-	 *.html
-
-	for filename in `find $(BASEDIR) -name "*.html"`; do \
-	 tidy -config tidy.conf $$filename; \
-	 true; \
-	done;
-
-	for filename in `find $(BASEDIR) -name "*.html"`; do \
-	 sed -i -e "s at text/html at application/xhtml+xml at g" $$filename; \
-	done;
-
 lfs:
 # top-level index.html
 	xsltproc --nonet --output $(BASEDIR)/index.html stylesheets/top-index.xsl prologue/bookinfo.xml
 
 # x86
 	xsltproc --xinclude --nonet -stringparam profile.condition html -stringparam profile.arch x86 \
-	  -stringparam base.dir $(BASEDIR)/x86/ stylesheets/lfs-chunked.xsl index.xml
+	  -stringparam chunk.quietly $(CHUNK_QUIET)  -stringparam base.dir $(BASEDIR)/x86/ \
+		stylesheets/lfs-chunked.xsl index.xml
 
 	if [ ! -e $(BASEDIR)/x86/stylesheets ]; then \
 	  mkdir -p $(BASEDIR)/x86/stylesheets; \
@@ -62,13 +31,14 @@
 
 # alpha
 #	xsltproc --xinclude --nonet -stringparam profile.condition html -stringparam profile.arch alpha \
-#	  -stringparam base.dir $(BASEDIR)/alpha/ stylesheets/lfs-chunked.xsl index.xml
-#
+#	  -stringparam chunk.quietly $(CHUNK_QUIET)  -stringparam base.dir $(BASEDIR)/alpha/ \
+#		stylesheets/lfs-chunked.xsl index.xml
+
 #	if [ ! -e $(BASEDIR)/alpha/stylesheets ]; then \
 #	  mkdir -p $(BASEDIR)/alpha/stylesheets; \
 #	fi;
 #	cp stylesheets/*.css $(BASEDIR)/alpha/stylesheets
-#
+
 #	if [ ! -e $(BASEDIR)/alpha/images ]; then \
 #	  mkdir -p $(BASEDIR)/alpha/images; \
 #	fi;
@@ -78,35 +48,37 @@
 #	  *.html
 #	cd $(BASEDIR)/alpha/; sed -i -e "s at ../images at images@g" \
 #	  *.html
-#
+
 # ppc
-#	xsltproc --xinclude --nonet -stringparam profile.condition html -stringparam profile.arch ppc \
-#	  -stringparam base.dir $(BASEDIR)/ppc/ stylesheets/lfs-chunked.xsl index.xml
-#
-#	if [ ! -e $(BASEDIR)/ppc/stylesheets ]; then \
-#	  mkdir -p $(BASEDIR)/ppc/stylesheets; \
-#	fi;
-#	cp stylesheets/*.css $(BASEDIR)/ppc/stylesheets
-#
-#	if [ ! -e $(BASEDIR)/ppc/images ]; then \
-#	  mkdir -p $(BASEDIR)/ppc/images; \
-#	fi;
-#	cp $(XSLROOTDIR)/images/*.png \
-#	  $(BASEDIR)/ppc/images
-#	cd $(BASEDIR)/ppc/; sed -i -e "s at ../stylesheets at stylesheets@g" \
-#	  *.html
-#	cd $(BASEDIR)/ppc/; sed -i -e "s at ../images at images@g" \
-#	  *.html
-#
+	xsltproc --xinclude --nonet -stringparam profile.condition html -stringparam profile.arch ppc \
+	  -stringparam chunk.quietly $(CHUNK_QUIET)  -stringparam base.dir $(BASEDIR)/ppc/ \
+		stylesheets/lfs-chunked.xsl index.xml
+
+	if [ ! -e $(BASEDIR)/ppc/stylesheets ]; then \
+	  mkdir -p $(BASEDIR)/ppc/stylesheets; \
+	fi;
+	cp stylesheets/*.css $(BASEDIR)/ppc/stylesheets
+
+	if [ ! -e $(BASEDIR)/ppc/images ]; then \
+	  mkdir -p $(BASEDIR)/ppc/images; \
+	fi;
+	cp $(XSLROOTDIR)/images/*.png \
+	  $(BASEDIR)/ppc/images
+	cd $(BASEDIR)/ppc/; sed -i -e "s at ../stylesheets at stylesheets@g" \
+	  *.html
+	cd $(BASEDIR)/ppc/; sed -i -e "s at ../images at images@g" \
+	  *.html
+
 # raq2
 #	xsltproc --xinclude --nonet -stringparam profile.condition html -stringparam profile.arch raq2 \
-#	  -stringparam base.dir $(BASEDIR)/raq2/ stylesheets/lfs-chunked.xsl index.xml
+#	  -stringparam chunk.quietly $(CHUNK_QUIET)  -stringparam base.dir $(BASEDIR)/raq2/ \
+#		stylesheets/lfs-chunked.xsl index.xml
 #
 #	if [ ! -e $(BASEDIR)/raq2/stylesheets ]; then \
 #	  mkdir -p $(BASEDIR)/raq2/stylesheets; \
 #	fi;
 #	cp stylesheets/*.css $(BASEDIR)/raq2/stylesheets
-#
+
 #	if [ ! -e $(BASEDIR)/raq2/images ]; then \
 #	  mkdir -p $(BASEDIR)/raq2/images; \
 #	fi;
@@ -116,7 +88,7 @@
 #	  *.html
 #	cd $(BASEDIR)/raq2/; sed -i -e "s at ../images at images@g" \
 #	  *.html
-#
+
 # common stuff
 	for filename in `find $(BASEDIR) -name "*.html"`; do \
 	  tidy -config tidy.conf $$filename; \
@@ -129,29 +101,30 @@
 
 html:
 	xsltproc --xinclude --nonet -stringparam profile.condition html -stringparam profile.arch $(ARCH) \
-	  -stringparam base.dir $(BASEDIR)/ stylesheets/lfs-chunked.xsl index.xml
+	  -stringparam chunk.quietly $(CHUNK_QUIET)  -stringparam base.dir $(BASEDIR)/$(ARCH)/ \
+		stylesheets/lfs-chunked.xsl index.xml
 
-	if [ ! -e $(BASEDIR)/stylesheets ]; then \
-	  mkdir -p $(BASEDIR)/stylesheets; \
+	if [ ! -e $(BASEDIR)/$(ARCH)/stylesheets ]; then \
+	  mkdir -p $(BASEDIR)/$(ARCH)/stylesheets; \
 	fi;
-	cp stylesheets/*.css $(BASEDIR)/stylesheets
+	cp stylesheets/*.css $(BASEDIR)/$(ARCH)/stylesheets
 
-	if [ ! -e $(BASEDIR)/images ]; then \
-	  mkdir -p $(BASEDIR)/images; \
+	if [ ! -e $(BASEDIR)/$(ARCH)/images ]; then \
+	  mkdir -p $(BASEDIR)/$(ARCH)/images; \
 	fi;
 	cp $(XSLROOTDIR)/images/*.png \
-	  $(BASEDIR)/images
-	cd $(BASEDIR)/; sed -i -e "s at ../stylesheets at stylesheets@g" \
+	  $(BASEDIR)/$(ARCH)/images
+	cd $(BASEDIR)/$(ARCH)/; sed -i -e "s at ../stylesheets at stylesheets@g" \
 	  *.html
-	cd $(BASEDIR)/; sed -i -e "s at ../images at images@g" \
+	cd $(BASEDIR)/$(ARCH)/; sed -i -e "s at ../images at images@g" \
 	  *.html
 
-	for filename in `find $(BASEDIR) -name "*.html"`; do \
+	for filename in `find $(BASEDIR)/$(ARCH) -name "*.html"`; do \
 	  tidy -config tidy.conf $$filename; \
 	  true; \
 	done;
 
-	for filename in `find $(BASEDIR) -name "*.html"`; do \
+	for filename in `find $(BASEDIR)/$(ARCH)/ -name "*.html"`; do \
 	  sed -i -e "s at text/html at application/xhtml+xml at g" $$filename; \
 	done;
 
@@ -184,9 +157,9 @@
 	xmllint --noout --nonet --postvalid index-x86.xml
 
 # alpha
-	xsltproc --xinclude --nonet -stringparam profile.arch alpha \
-		 --output index-alpha.xml stylesheets/lfs-profile.xsl index.xml
-	xmllint --noout --nonet --postvalid index-alpha.xml
+#	xsltproc --xinclude --nonet -stringparam profile.arch alpha \
+#		 --output index-alpha.xml stylesheets/lfs-profile.xsl index.xml
+#	xmllint --noout --nonet --postvalid index-alpha.xml
 
 # ppc
 	xsltproc --xinclude --nonet -stringparam profile.arch ppc \
@@ -194,9 +167,9 @@
 	xmllint --noout --nonet --postvalid index-ppc.xml
 
 # raq2
-	xsltproc --xinclude --nonet -stringparam profile.arch raq2 \
-		 --output index-raq2.xml stylesheets/lfs-profile.xsl index.xml
-	xmllint --noout --nonet --postvalid index-raq2.xml
+#	xsltproc --xinclude --nonet -stringparam profile.arch raq2 \
+#		 --output index-raq2.xml stylesheets/lfs-profile.xsl index.xml
+#	xmllint --noout --nonet --postvalid index-raq2.xml
 
 # clean-up
 	rm index-x86.xml index-alpha.xml index-ppc.xml index-raq2.xml

Modified: branches/cross-lfs/BOOK/cross-tools/glibc-headers.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/glibc-headers.xml	2005-05-02 12:19:43 UTC (rev 5168)
+++ branches/cross-lfs/BOOK/cross-tools/glibc-headers.xml	2005-05-04 15:30:20 UTC (rev 5169)
@@ -48,16 +48,26 @@
 <screen><userinput>mkdir ../glibc-build
 cd ../glibc-build</userinput></screen>
 
+<para arch="ppc">On the ppc arch, NPTL requires the following to be set:</para>
+
+<screen arch="ppc"><userinput>echo "libc_cv_ppc_machine=yes" > config.cache</userinput></screen>
+
 <para>Next, prepare Glibc for compilation:</para>
 
-<screen arch="alpha;ppc;x86;"><userinput>CC="${LFS_TARGET}-gcc" ../glibc-&glibc-version;/configure --prefix=/tools \
+<screen arch="alpha;x86;"><userinput>CC="${CC-gcc}" ../glibc-&glibc-version;/configure --prefix=/tools \
     --host=${LFS_TARGET} --build=${LFS_HOST} --enable-add-ons \
     --disable-sanity-checks --with-headers=/tools/include \
     --with-binutils=/cross-tools/${LFS_TARGET}/bin</userinput></screen>
 
-<screen arch="raq2"><userinput>CC="${LFS_TARGET}-gcc" ../glibc-&glibc-version;/configure --prefix=/tools \
+<screen arch="ppc"><userinput>CC="${CC-gcc}" ../glibc-&glibc-version;/configure --prefix=/tools \
     --host=${LFS_TARGET} --build=${LFS_HOST} --enable-add-ons \
     --disable-sanity-checks --with-headers=/tools/include \
+    --with-binutils=/cross-tools/${LFS_TARGET}/bin \
+    --cache-file=config.cache</userinput></screen>
+
+<screen arch="raq2"><userinput>CC="${CC-gcc}" ../glibc-&glibc-version;/configure --prefix=/tools \
+    --host=${LFS_TARGET} --build=${LFS_HOST} --enable-add-ons \
+    --disable-sanity-checks --with-headers=/tools/include \
     --enable-kernel=2.6.0 --with-binutils=/cross-tools/${LFS_TARGET}/bin</userinput></screen>
 
 <para>Now  Install the package:</para>

Modified: branches/cross-lfs/BOOK/cross-tools/linux-libc-headers-ppc.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/linux-libc-headers-ppc.xml	2005-05-02 12:19:43 UTC (rev 5168)
+++ branches/cross-lfs/BOOK/cross-tools/linux-libc-headers-ppc.xml	2005-05-04 15:30:20 UTC (rev 5169)
@@ -22,8 +22,6 @@
   href="linux-libc-headers.xml"
   xpointer="xpointer(/sect1/sect2[@role='installation']/para[1])"/>
 
-<para>Install the header files:</para>
-
 <screen><userinput>install -d /tools/include
 cp -R include/asm-ppc /tools/include/asm
 cp -R include/linux /tools/include</userinput></screen>

Modified: branches/cross-lfs/BOOK/general.ent
===================================================================
--- branches/cross-lfs/BOOK/general.ent	2005-05-02 12:19:43 UTC (rev 5168)
+++ branches/cross-lfs/BOOK/general.ent	2005-05-04 15:30:20 UTC (rev 5169)
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "7.0-cross-lfs-20050502">
+<!ENTITY version "7.0-cross-lfs-20050504">
 <!ENTITY version-x86 "&version;-x86">
+<!ENTITY version-ppc "&version;-PowerPC">
 <!ENTITY version-alpha "&version;-alpha">
-<!ENTITY version-ppc "&version;-PowerPC">
 <!ENTITY version-raq2 "&version;-RaQ2">
-<!ENTITY releasedate "May 2, 2005">
+
+<!ENTITY releasedate "May 4, 2005">
 <!ENTITY milestone "7.0">
 
 <!ENTITY lfs-root "http://www.linuxfromscratch.org/">

Modified: branches/cross-lfs/BOOK/introduction/changelog.xml
===================================================================
--- branches/cross-lfs/BOOK/introduction/changelog.xml	2005-05-02 12:19:43 UTC (rev 5168)
+++ branches/cross-lfs/BOOK/introduction/changelog.xml	2005-05-04 15:30:20 UTC (rev 5169)
@@ -96,6 +96,16 @@
 -->
 
 <itemizedlist>
+<listitem><para>May 4, 2005 [jhuntwork]</para>
+<itemizedlist>
+<listitem><para>Fixed CC variable used in glibc headers.</para></listitem>
+<listitem><para>Added ppc specific info to glibc headers build.</para></listitem>
+</itemizedlist>
+</listitem>
+</itemizedlist>
+
+
+<itemizedlist>
 <listitem><para>May 2, 2005 [jhuntwork]</para>
 <itemizedlist>
 <listitem><para>Fixed Grub instructions (stages kept in /usr/lib/grub now).</para></listitem>

Modified: branches/cross-lfs/BOOK/stylesheets/top-index.xsl
===================================================================
--- branches/cross-lfs/BOOK/stylesheets/top-index.xsl	2005-05-02 12:19:43 UTC (rev 5168)
+++ branches/cross-lfs/BOOK/stylesheets/top-index.xsl	2005-05-04 15:30:20 UTC (rev 5169)
@@ -102,7 +102,7 @@
       </div>
       <div class="toc">
         <h3>
-          <xsl:text>Choose your architecture</xsl:text>
+          <xsl:text>Choose the architecture of your target machine</xsl:text>
         </h3>
         <ul>
           <li>
@@ -114,25 +114,11 @@
           </li>
           <li>
             <h4>
-              <a href="alpha">
-                <xsl:text>Alpha</xsl:text>
-              </a>
-	    </h4>
-	  </li>
-          <li>
-            <h4>
               <a href="ppc">
                 <xsl:text>PowerPC</xsl:text>
               </a>
 	    </h4>
 	  </li>
-          <li>
-            <h4>
-              <a href="raq2">
-                <xsl:text>Colbalt RaQ2/Cube2</xsl:text>
-              </a>
-            </h4>
-          </li>
         </ul>
       </div>
     </div>




More information about the lfs-book mailing list