r6785 - in branches/gcc4/BOOK: . chapter01 chapter02 chapter06 prologue stylesheets

matthew at linuxfromscratch.org matthew at linuxfromscratch.org
Wed Aug 31 12:14:39 PDT 2005


Author: matthew
Date: 2005-08-31 13:14:38 -0600 (Wed, 31 Aug 2005)
New Revision: 6785

Added:
   branches/gcc4/BOOK/stylesheets/dump-commands.xsl
Modified:
   branches/gcc4/BOOK/Makefile
   branches/gcc4/BOOK/chapter01/changelog.xml
   branches/gcc4/BOOK/chapter02/creatingfilesystem.xml
   branches/gcc4/BOOK/chapter06/bash.xml
   branches/gcc4/BOOK/chapter06/glibc.xml
   branches/gcc4/BOOK/general.ent
   branches/gcc4/BOOK/prologue/typography.xml
Log:
Mainline merge as of 2005-08-31

Modified: branches/gcc4/BOOK/Makefile
===================================================================
--- branches/gcc4/BOOK/Makefile	2005-08-31 18:05:31 UTC (rev 6784)
+++ branches/gcc4/BOOK/Makefile	2005-08-31 19:14:38 UTC (rev 6785)
@@ -1,4 +1,5 @@
 BASEDIR=~/lfs-book
+DUMPDIR=~/lfs-commands
 CHUNK_QUIET=0
 PDF_OUTPUT=LFS-BOOK.pdf
 NOCHUNKS_OUTPUT=LFS-BOOK.html
@@ -27,13 +28,7 @@
 	for filename in `find $(BASEDIR) -name "*.html"`; do \
 	  tidy -config tidy.conf $$filename; \
 	  true; \
-	done;
-
-	for filename in `find $(BASEDIR) -name "*.html"`; do \
 	  sh obfuscate.sh $$filename; \
-	done;
-
-	for filename in `find $(BASEDIR) -name "*.html"`; do \
 	  sed -i -e "s at text/html at application/xhtml+xml at g" $$filename; \
 	done;
 
@@ -60,13 +55,17 @@
 	--output $(BASEDIR)/$(NOCHUNKS_OUTPUT) \
 	  stylesheets/lfs-nochunks.xsl index.xml
 
-	sh obfuscate.sh $(BASEDIR)/$(NOCHUNKS_OUTPUT)
-
 	tidy -config tidy.conf $(BASEDIR)/$(NOCHUNKS_OUTPUT) || true
 
+	sh obfuscate.sh $(BASEDIR)/$(NOCHUNKS_OUTPUT)
+
 	sed -i -e "s at text/html at application/xhtml+xml at g"  \
 	  $(BASEDIR)/$(NOCHUNKS_OUTPUT)
 
+dump-commands:
+	xsltproc --xinclude --nonet --output $(DUMPDIR)/ \
+	   stylesheets/dump-commands.xsl index.xml
+
 validate:
 	xmllint --noout --nonet --xinclude --postvalid index.xml
 

Modified: branches/gcc4/BOOK/chapter01/changelog.xml
===================================================================
--- branches/gcc4/BOOK/chapter01/changelog.xml	2005-08-31 18:05:31 UTC (rev 6784)
+++ branches/gcc4/BOOK/chapter01/changelog.xml	2005-08-31 19:14:38 UTC (rev 6785)
@@ -129,6 +129,9 @@
 <listitem><para>August 30th, 2005 [ken]: Remove <command>sed -i</command>
  commands from gcc-pass2.</para></listitem>
 
+<listitem><para>August 28th, 2005 [jhuntwork]: Adjusted tar commands in Bash
+and Glibc chapter six builds for consistency</para></listitem>
+
 <listitem><para>August 23rd, 2005 [matt]: <command>find</command> may fail due
 to a race condition when deleting files.  Remove the && construct in
 chapter05/adjusting.xml so that the rest of the commands for removing fixed

Modified: branches/gcc4/BOOK/chapter02/creatingfilesystem.xml
===================================================================
--- branches/gcc4/BOOK/chapter02/creatingfilesystem.xml	2005-08-31 18:05:31 UTC (rev 6784)
+++ branches/gcc4/BOOK/chapter02/creatingfilesystem.xml	2005-08-31 19:14:38 UTC (rev 6785)
@@ -29,7 +29,7 @@
 features, upgrade your e2fsprogs</quote>.  To check if your host system
 uses custom enhancements, run the following command:</para>
 
-<screen><userinput>debugfs -R feature /dev/<replaceable>[xxx]</replaceable></userinput></screen>
+<screen role="nodump"><userinput>debugfs -R feature /dev/<replaceable>[xxx]</replaceable></userinput></screen>
 
 <para>If the output contains features other than: dir_index; filetype;
 large_file; resize_inode or sparse_super then your host system may have custom
@@ -37,7 +37,7 @@
 stock e2fsprogs package and use the resulting binaries to re-create the
 filesystem on your LFS partition:</para>
 
-<screen><userinput>cd /tmp
+<screen role="nodump"><userinput>cd /tmp
 tar xjf /path/to/sources/e2fsprogs-&e2fsprogs-version;.tar.bz2
 cd e2fsprogs-&e2fsprogs-version;
 mkdir build

Modified: branches/gcc4/BOOK/chapter06/bash.xml
===================================================================
--- branches/gcc4/BOOK/chapter06/bash.xml	2005-08-31 18:05:31 UTC (rev 6784)
+++ branches/gcc4/BOOK/chapter06/bash.xml	2005-08-31 19:14:38 UTC (rev 6785)
@@ -33,7 +33,7 @@
 <para>If you downloaded the Bash documentation tarball and wish to install HTML
 documentation, issue the following commands:</para>
 
-<screen><userinput>tar -zxf ../bash-doc-&bash-doc-version;.tar.gz &&
+<screen><userinput>tar -xf ../bash-doc-&bash-doc-version;.tar.gz &&
 sed -i "s|htmldir = @htmldir@|htmldir = /usr/share/doc/bash-&bash-version;|" \
     Makefile.in</userinput></screen>
 

Modified: branches/gcc4/BOOK/chapter06/glibc.xml
===================================================================
--- branches/gcc4/BOOK/chapter06/glibc.xml	2005-08-31 18:05:31 UTC (rev 6784)
+++ branches/gcc4/BOOK/chapter06/glibc.xml	2005-08-31 19:14:38 UTC (rev 6785)
@@ -60,7 +60,7 @@
 threading libraries installed by Glibc.  Unpack the tarball from
 within the Glibc source directory:</para>
 
-<screen><userinput>tar -xjvf /sources/glibc-linuxthreads-&glibc-version;.tar.bz2</userinput></screen>
+<screen><userinput>tar -xf /sources/glibc-linuxthreads-&glibc-version;.tar.bz2</userinput></screen>
 
 <para>Glibc has two tests which fail when the running kernel is 2.6.11.x The
 problem has been determined to be with the tests themselves, not with the libc

Modified: branches/gcc4/BOOK/general.ent
===================================================================
--- branches/gcc4/BOOK/general.ent	2005-08-31 18:05:31 UTC (rev 6784)
+++ branches/gcc4/BOOK/general.ent	2005-08-31 19:14:38 UTC (rev 6785)
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "GCC4-20050830">
-<!ENTITY releasedate "August 30, 2005">
+<!ENTITY version "GCC4-20050831">
+<!ENTITY releasedate "August 31, 2005">
 <!ENTITY milestone "6.2">
 <!ENTITY generic-version "gcc4"> <!-- Use "svn", "testing", or "x.y[-pre{x}]" -->
 

Modified: branches/gcc4/BOOK/prologue/typography.xml
===================================================================
--- branches/gcc4/BOOK/prologue/typography.xml	2005-08-31 18:05:31 UTC (rev 6784)
+++ branches/gcc4/BOOK/prologue/typography.xml	2005-08-31 19:14:38 UTC (rev 6785)
@@ -12,7 +12,7 @@
 examples of the typographical format found throughout Linux From
 Scratch.</para>
 
-<screen><userinput>./configure --prefix=/usr</userinput></screen>
+<screen role="nodump"><userinput>./configure --prefix=/usr</userinput></screen>
 
 <para>This form of text is designed to be typed exactly as seen unless
 otherwise noted in the surrounding text. It is also used in the
@@ -37,7 +37,7 @@
 community and to external pages.  It includes HOWTOs, download locations,
 and websites.</para>
 
-<screen><userinput>cat > $LFS/etc/group << "EOF"
+<screen role="nodump"><userinput>cat > $LFS/etc/group << "EOF"
 <literal>root:x:0:
 bin:x:1:
 ......</literal>

Copied: branches/gcc4/BOOK/stylesheets/dump-commands.xsl (from rev 6774, trunk/BOOK/stylesheets/dump-commands.xsl)


Property changes on: branches/gcc4/BOOK/stylesheets/dump-commands.xsl
___________________________________________________________________
Name: svn:keywords
   + "Author Date Revision Id"




More information about the lfs-book mailing list