[Clfs-commits] [CLFS Embedded]Cross-LFS Embedded Book branch, master, updated. 22d256ff1e7f104d0ecf7105a086970075d6f72b

git git at cross-lfs.org
Tue Jun 11 07:41:28 PDT 2013


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Embedded Book".

The branch, master has been updated
       via  22d256ff1e7f104d0ecf7105a086970075d6f72b (commit)
       via  df58f1de3e2f63e452856172afc0ced375e89fd4 (commit)
       via  891e001705cc16da65538eb412a33291858e43de (commit)
       via  a217acdd97ee9f541531fc7abc1770021b8007f8 (commit)
       via  4472cad2227ec0bd43db896adfebbb1a14fe8d12 (commit)
       via  8ee102db36422f044a617d95773f80a8a68b10f5 (commit)
       via  2697c08bac69b2b6ac7ae4ba02605f7178e12974 (commit)
       via  d1a50594b45f4142fdd8c045bd1ff89bcde108e4 (commit)
       via  7863860022fff23f7335e614a2066296b94eea48 (commit)
       via  cade83031e6d2dc3a787560debecf06065055244 (commit)
       via  a040561b34944e14556e4a598c5c92184d7bb8a1 (commit)
       via  766b7b406b866ebdb254b5fb2e63d9cc9ede5fb0 (commit)
       via  402e2e3db8adae1e94cbb62dac056ad076ac3d9a (commit)
       via  78b14838452ca451822c18572292c98f6c0ca536 (commit)
       via  16ed8d6c03e74c5da85f811f0c3b7b52dae74491 (commit)
       via  dffb50340f4ed38531cc28a4373a879108e35f26 (commit)
       via  705ef4987b0badfb90b43c15cad5a05f26648284 (commit)
       via  3ec0aae3a6cba9ae0eab3b76c5fb6d0a170fc10a (commit)
       via  3aa06353a78b7b87245625f355d682013de14429 (commit)
       via  36dec8b4190561f98c5dcf3e69682f3cef418e8a (commit)
       via  abdff1e5652907290908f5ae86dde2c614d6e732 (commit)
       via  d97ea33bb1b5f0921854edf720c2ee5c2ca33cab (commit)
       via  f14d2fe04b6a12e4a6b381a27ce66e903c5ad019 (commit)
       via  b057e2d41814ae78d0f4e4066ee588a5409b5767 (commit)
       via  4859af8a2f43448438298d0c41a9286e15df1aef (commit)
       via  833b9a50eda7650703b1ce417ec176e3b2e44534 (commit)
       via  5e492c0733a20f95acaf74893f7a09e500b599a1 (commit)
       via  8d661ecbb541f8a19d9d0973e4286365ece74989 (commit)
       via  6935fe60c70302cfa6d7b3d7071e86ef6f971608 (commit)
       via  785054f2be0146b49fc698d2f173c013175aeb2e (commit)
       via  c4b6d181bc65ba5f726b5d4c3cb9d77f45f1a10e (commit)
      from  79440315ff9ac40664723e1efdfea5088aa7a045 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 22d256ff1e7f104d0ecf7105a086970075d6f72b
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date:   Tue Jun 11 10:11:25 2013 -0400

    general: Update date

diff --git a/BOOK/general.ent b/BOOK/general.ent
index d8b0ef2..f49d4ec 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!ENTITY month "09"> <!-- Use two digits -->
-<!ENTITY month_name "September">
-<!ENTITY day "22"> <!-- Use two digits -->
-<!ENTITY year "2012"> <!-- Use four digits -->
+<!ENTITY month "06"> <!-- Use two digits -->
+<!ENTITY month_name "June">
+<!ENTITY day "11"> <!-- Use two digits -->
+<!ENTITY year "2013"> <!-- Use four digits -->
 
 <!ENTITY releasedate "&month_name; &day;, &year;">
 

commit df58f1de3e2f63e452856172afc0ced375e89fd4
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date:   Tue Jun 11 10:10:22 2013 -0400

    changelog: Updates since 2012

diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 5f9848d..f4cc9e6 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -36,6 +36,25 @@
     </listitem>
 -->
     <listitem>
+      <para>June 11, 2013</para>
+      <itemizedlist>
+        <listitem>
+          <para>[abradford] - Many package updates.</para>
+        </listitem>
+        <listitem>
+          <para>[abradford] - Removal of some LFS specific information.</para>
+        </listitem>
+        <listitem>
+          <para>[abradford] - Update host requirements to at least Debian
+            Squeeze.</para>
+        </listitem>
+        <listitem>
+          <para>[kterrell] - Removal of sources from final tarball.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>September 22, 2012</para>
       <itemizedlist>
         <listitem>

commit 891e001705cc16da65538eb412a33291858e43de
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date:   Tue Jun 11 10:04:49 2013 -0400

    packages: Update e2fsprogs to 1.42.7

diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index 63ee6ab..725ff9f 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -108,10 +108,10 @@
 
 <!-- Beyond CLFS file system packages -->
 
-<!ENTITY e2fsprogs-version "1.41.14">
-<!ENTITY e2fsprogs-size "4,407 KB">
+<!ENTITY e2fsprogs-version "1.42.7">
+<!ENTITY e2fsprogs-size "5840 KB">
 <!ENTITY e2fsprogs-url "&sourceforge;e2fsprogs/e2fsprogs-&e2fsprogs-version;.tar.gz">
-<!ENTITY e2fsprogs-md5 "05f70470aea2ef7efbb0845b2b116720">
+<!ENTITY e2fsprogs-md5 "a1ec22ef003688dae9f76c74881b22b9">
 <!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net">
 
 <!-- WRT Specific packages -->

commit a217acdd97ee9f541531fc7abc1770021b8007f8
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date:   Tue Jun 11 09:59:26 2013 -0400

    Remove ARM gcc soft-float patch

diff --git a/BOOK/cross-tools/arm/gcc-static.xml b/BOOK/cross-tools/arm/gcc-static.xml
index d4e727d..70bf49f 100644
--- a/BOOK/cross-tools/arm/gcc-static.xml
+++ b/BOOK/cross-tools/arm/gcc-static.xml
@@ -27,17 +27,6 @@
   href="../common/gcc-static.xml"
   xpointer="xpointer(//*[@os='a'])"/>
 
-  <important>
-
-    <para>If you set ${CLFS_FLOAT} to "soft" or "softfp", you must apply the 
-    &gcc-uclibc-arm-softfloat-patch;.  Check what ${CLFS_FLOAT} is set to and
-    if needed, apply the patch:</para>
-
-<screen><userinput>echo ${CLFS_FLOAT}
-patch -Np1 -i ../&gcc-uclibc-arm-softfloat-patch;</userinput></screen>
-
-  </important>
-
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/gcc-static.xml"
   xpointer="xpointer(//*[@os='c'])"/>
diff --git a/BOOK/materials/arm/patches.xml b/BOOK/materials/arm/patches.xml
index 82a883b..4cff217 100644
--- a/BOOK/materials/arm/patches.xml
+++ b/BOOK/materials/arm/patches.xml
@@ -10,19 +10,9 @@
 
   <title>Additional Patches for ARM</title>
 
-  <variablelist role="materials">
-
-    <varlistentry os="gcc-uclibc-arm-softfloat-patch">
-      <term>GCC uClibc ARM Soft Floating Point Patch - <token>&gcc-uclibc-arm-softfloat-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&gcc-uclibc-arm-softfloat-patch;"/></para>
-        <para>MD5 sum: <literal>&gcc-uclibc-arm-softfloat-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-  </variablelist>
-
+<!--<variablelist role="materials">
+    </variablelist>
+-->
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/patches.xml"
diff --git a/BOOK/patches.ent b/BOOK/patches.ent
index 9c27863..69698d6 100644
--- a/BOOK/patches.ent
+++ b/BOOK/patches.ent
@@ -26,10 +26,6 @@
 
 <!-- ARM Patches -->
 
-<!ENTITY gcc-uclibc-arm-softfloat-patch "gcc-&gcc-version;-uclibc-arm-softfloat-2.patch">
-<!ENTITY gcc-uclibc-arm-softfloat-patch-md5 "365f3e9d4979fc31ef338907ee8f97dd">
-<!ENTITY gcc-uclibc-arm-softfloat-patch-size "3 KB">
-
 <!-- MIPS Patches -->
 
 <!ENTITY linux-bcm43xx-patch "linux-&linux-version;-openwrt-bcm47xx-fixes-2.patch">
diff --git a/patches/gcc-4.6.0-uclibc-arm-softfloat-2.patch b/patches/gcc-4.6.0-uclibc-arm-softfloat-2.patch
deleted file mode 100644
index 0af23f4..0000000
--- a/patches/gcc-4.6.0-uclibc-arm-softfloat-2.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Submitted By: Andrew Bradford <bradfa at gmail.com>
-Date: 2011-04-12
-Initial Package Version: 4.6.0
-Upstream Status: Modified From Buildroot (uClibc) Team
-Origin: http://git.buildroot.net/buildroot/tree/toolchain/gcc/4.5.2/810-arm-softfloat-libgcc.patch
-Description: This patch configures GCC to produce the required asm functions
-             to enable soft floating point operation in libgcc for ARM systems
-             using uClibc.  GCC will use the file gcc/config/arm/ieee754-df.S
-             where these routines are stored.  This doesn't happen by default,
-             thus requiring this patch.
-
-             Modified from the Buildroot team's original as it wouldn't apply
-             cleanly to GCC-4.6.0.  Content is the same but with different
-             offsets.
-
-diff -Nar '--unified=5' gcc-4.6.0.orig/gcc/config/arm/linux-elf.h gcc-4.6.0/gcc/config/arm/linux-elf.h
---- gcc-4.6.0.orig/gcc/config/arm/linux-elf.h	2011-04-12 05:59:31.000000000 -0400
-+++ gcc-4.6.0/gcc/config/arm/linux-elf.h	2011-04-12 06:01:34.000000000 -0400
-@@ -58,11 +58,11 @@
- #define LIB_SPEC \
-   "%{pthread:-lpthread} \
-    %{shared:-lc} \
-    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
- 
--#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
-+#define LIBGCC_SPEC "-lgcc"
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
- 
- #define LINUX_TARGET_LINK_SPEC  "%{h*} \
-    %{static:-Bstatic} \
-diff -Nar '--unified=5' gcc-4.6.0.orig/gcc/config/arm/t-linux gcc-4.6.0/gcc/config/arm/t-linux
---- gcc-4.6.0.orig/gcc/config/arm/t-linux	2011-04-12 05:59:31.000000000 -0400
-+++ gcc-4.6.0/gcc/config/arm/t-linux	2011-04-12 06:03:02.000000000 -0400
-@@ -21,11 +21,15 @@
- # difference.
- TARGET_LIBGCC2_CFLAGS = -fomit-frame-pointer -fPIC
- 
- LIB1ASMSRC = arm/lib1funcs.asm
- LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
--	_arm_addsubdf3 _arm_addsubsf3
-+	_arm_addsubdf3 _arm_addsubsf3 \
-+	_arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
-+	_arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
-+	_arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
-+	_arm_fixsfsi _arm_fixunssfsi
- 
- # MULTILIB_OPTIONS = mhard-float/msoft-float
- # MULTILIB_DIRNAMES = hard-float soft-float
- 
- # EXTRA_MULTILIB_PARTS = crtbegin.o crtend.o

commit 4472cad2227ec0bd43db896adfebbb1a14fe8d12
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date:   Tue Jun 11 09:56:12 2013 -0400

    Remove busybox 1.17.3 fixes patch
    
    Moved to newer busybox version.

diff --git a/patches/busybox-1.17.3-fixes-1.patch b/patches/busybox-1.17.3-fixes-1.patch
deleted file mode 100644
index 351db86..0000000
--- a/patches/busybox-1.17.3-fixes-1.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-Submitted By: Joe Ciccone <jciccone at gmail.com>
-Date: 2010-11-21
-Initial Package Version: 1.17.3
-Upstream Status: From Upstream
-Origin: http://busybox.net/downloads/fixes-1.17.3/
-Description: This patch includes the following upstream patches.
-
-             busybox-1.17.3-dnsd.patch
-             busybox-1.17.3-iproute.patch
-             busybox-1.17.3-ls.patch
-             busybox-1.17.3-sort.patch
-             busybox-1.17.3-unicode.patch
-
-diff -Naur busybox-1.17.3.orig/coreutils/ls.c busybox-1.17.3/coreutils/ls.c
---- busybox-1.17.3.orig/coreutils/ls.c	2010-10-09 15:57:13.000000000 -0400
-+++ busybox-1.17.3/coreutils/ls.c	2010-11-21 08:38:13.024346417 -0500
-@@ -184,7 +184,7 @@
- 	LIST_INO,                   /* i */
- 	LIST_LONG | STYLE_LONG,     /* l - remember LS_DISP_HR in mask! */
- 	LIST_SHORT | STYLE_SINGLE,  /* 1 */
--	0,                          /* g (don't show group) - handled via OPT_g */
-+	0,                          /* g (don't show owner) - handled via OPT_g */
- 	LIST_ID_NUMERIC,            /* n */
- 	LIST_BLOCKS,                /* s */
- 	DISP_ROWS,                  /* x */
-@@ -621,7 +621,7 @@
- 	if (all_fmt & LIST_ID_NAME) {
- 		if (option_mask32 & OPT_g) {
- 			column += printf("%-8.8s ",
--				get_cached_username(dn->dstat.st_uid));
-+				get_cached_groupname(dn->dstat.st_gid));
- 		} else {
- 			column += printf("%-8.8s %-8.8s ",
- 				get_cached_username(dn->dstat.st_uid),
-@@ -631,7 +631,7 @@
- #endif
- 	if (all_fmt & LIST_ID_NUMERIC) {
- 		if (option_mask32 & OPT_g)
--			column += printf("%-8u ", (int) dn->dstat.st_uid);
-+			column += printf("%-8u ", (int) dn->dstat.st_gid);
- 		else
- 			column += printf("%-8u %-8u ",
- 					(int) dn->dstat.st_uid,
-diff -Naur busybox-1.17.3.orig/coreutils/sort.c busybox-1.17.3/coreutils/sort.c
---- busybox-1.17.3.orig/coreutils/sort.c	2010-10-09 15:57:13.000000000 -0400
-+++ busybox-1.17.3/coreutils/sort.c	2010-11-21 08:38:13.024346417 -0500
-@@ -412,7 +412,7 @@
- #if ENABLE_FEATURE_SORT_BIG
- 	/* Open output file _after_ we read all input ones */
- 	if (option_mask32 & FLAG_o)
--		xmove_fd(xopen3(str_o, O_WRONLY, 0666), STDOUT_FILENO);
-+		xmove_fd(xopen3(str_o, O_WRONLY|O_CREAT|O_TRUNC, 0666), STDOUT_FILENO);
- #endif
- 	flag = (option_mask32 & FLAG_z) ? '\0' : '\n';
- 	for (i = 0; i < linecount; i++)
-diff -Naur busybox-1.17.3.orig/libbb/unicode.c busybox-1.17.3/libbb/unicode.c
---- busybox-1.17.3.orig/libbb/unicode.c	2010-10-09 15:58:13.000000000 -0400
-+++ busybox-1.17.3/libbb/unicode.c	2010-11-21 08:38:13.028345948 -0500
-@@ -1006,7 +1006,7 @@
- 			}
- 		}
- 		if (stats)
--			stats->byte_count = stats->unicode_count = (d - dst);
-+			stats->byte_count = stats->unicode_count = stats->unicode_width = (d - dst);
- 		return dst;
- 	}
- 
-diff -Naur busybox-1.17.3.orig/networking/dnsd.c busybox-1.17.3/networking/dnsd.c
---- busybox-1.17.3.orig/networking/dnsd.c	2010-10-09 15:57:14.000000000 -0400
-+++ busybox-1.17.3/networking/dnsd.c	2010-11-21 08:38:13.020345600 -0500
-@@ -388,7 +388,7 @@
- 	query_len = strlen(query_string) + 1;
- 	/* may be unaligned! */
- 	unaligned_type_class = (void *)(query_string + query_len);
--	query_len += sizeof(unaligned_type_class);
-+	query_len += sizeof(*unaligned_type_class);
- 	/* where to append answer block */
- 	answb = (void *)(unaligned_type_class + 1);
- 
-diff -Naur busybox-1.17.3.orig/networking/libiproute/iproute.c busybox-1.17.3/networking/libiproute/iproute.c
---- busybox-1.17.3.orig/networking/libiproute/iproute.c	2010-10-09 15:57:14.000000000 -0400
-+++ busybox-1.17.3/networking/libiproute/iproute.c	2010-11-21 08:38:13.020345600 -0500
-@@ -791,8 +791,8 @@
- 				}
- 				req.r.rtm_dst_len = addr.bitlen;
- 			}
--			argv++;
- 		}
-+		argv++;
- 	}
- 
- 	if (req.r.rtm_dst_len == 0) {

commit 8ee102db36422f044a617d95773f80a8a68b10f5
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date:   Tue Jun 11 09:54:46 2013 -0400

    Remove iptables fixes patch
    
    Updated to newer version of iptables.

diff --git a/BOOK/beyond-net/common/iptables.xml b/BOOK/beyond-net/common/iptables.xml
index 25f9d0a..c0a4763 100644
--- a/BOOK/beyond-net/common/iptables.xml
+++ b/BOOK/beyond-net/common/iptables.xml
@@ -25,10 +25,6 @@
   <sect2 role="installation">
     <title>Installation of iptables</title>
 
-   <para os="p1">Fixes Compile Issue with DO_MULTI=1:</para>
-
-    <screen os="p2"><userinput>patch -Np1 -i ../&iptables-fixes-patch;</userinput></screen>
-
     <para os="a">Configure IPTables:</para>
 
 <screen os="b"><userinput>CC="${CC} -Os" ./configure --prefix=/usr --host=${CLFS_TARGET} \
diff --git a/BOOK/beyond-net/common/patches.xml b/BOOK/beyond-net/common/patches.xml
index eed0cb5..becda1d 100644
--- a/BOOK/beyond-net/common/patches.xml
+++ b/BOOK/beyond-net/common/patches.xml
@@ -16,17 +16,9 @@
   make the packages easier to work with. The following patches will be
   needed in order to build the associated packages:</para>
 
-  <variablelist role="beyond-clfs3">
-
-    <varlistentry>
-      <term>IPTables Fixes Patch - <token>&iptables-fixes-patch-size;</token>:</term> <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&iptables-fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&iptables-fixes-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-  </variablelist>
+<!--<variablelist role="beyond-clfs3">
+    </variablelist>
+-->
 
   <para os="a">Total size of these patches: about <returnvalue/></para>
 
diff --git a/BOOK/patches.ent b/BOOK/patches.ent
index 412ceba..9c27863 100644
--- a/BOOK/patches.ent
+++ b/BOOK/patches.ent
@@ -24,10 +24,6 @@
 
 <!-- Beyond patches -->
 
-<!ENTITY iptables-fixes-patch "iptables-&iptables-version;-fixes-1.patch">
-<!ENTITY iptables-fixes-patch-md5 "5a8bc894706019ea4f42e506633a49bf">
-<!ENTITY iptables-fixes-patch-size "5 KB">
-
 <!-- ARM Patches -->
 
 <!ENTITY gcc-uclibc-arm-softfloat-patch "gcc-&gcc-version;-uclibc-arm-softfloat-2.patch">
diff --git a/patches/iptables-1.4.2-fixes-1.patch b/patches/iptables-1.4.2-fixes-1.patch
deleted file mode 100644
index d9318f9..0000000
--- a/patches/iptables-1.4.2-fixes-1.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-Submitted By: Jim Gifford (jim at cross-lfs dot org)
-Date: 01-26-2009
-Initial Package Version: 1.4.2
-Origin: Upstream
-Upstream Status: Applied
-Description: This patch fixed issues that have been resolved in the current iptables tree.
-
-diff -Naur iptables-1.4.2.orig/extensions/libxt_hashlimit.c iptables-1.4.2/extensions/libxt_hashlimit.c
---- iptables-1.4.2.orig/extensions/libxt_hashlimit.c	2008-10-08 09:31:58.000000000 -0700
-+++ iptables-1.4.2/extensions/libxt_hashlimit.c	2009-01-26 14:56:10.367249615 -0800
-@@ -636,7 +636,7 @@
- 	if (info->cfg.max != 0)
- 		printf("--hashlimit-htable-max %u ", info->cfg.max);
- 	if (info->cfg.gc_interval != XT_HASHLIMIT_GCINTERVAL)
--		printf("--hashlimit-htable-gcinterval %u", info->cfg.gc_interval);
-+		printf("--hashlimit-htable-gcinterval %u ", info->cfg.gc_interval);
- 	if (info->cfg.expire != XT_HASHLIMIT_EXPIRE)
- 		printf("--hashlimit-htable-expire %u ", info->cfg.expire);
- 
-diff -Naur iptables-1.4.2.orig/extensions/libxt_iprange.c iptables-1.4.2/extensions/libxt_iprange.c
---- iptables-1.4.2.orig/extensions/libxt_iprange.c	2008-10-08 09:31:58.000000000 -0700
-+++ iptables-1.4.2/extensions/libxt_iprange.c	2009-01-26 14:58:09.455715602 -0800
-@@ -5,6 +5,7 @@
- #include <stdlib.h>
- #include <getopt.h>
- 
-+#include <netinet/in.h>
- #include <xtables.h>
- #include <linux/netfilter.h>
- #include <linux/netfilter/xt_iprange.h>
-diff -Naur iptables-1.4.2.orig/extensions/libxt_owner.c iptables-1.4.2/extensions/libxt_owner.c
---- iptables-1.4.2.orig/extensions/libxt_owner.c	2008-10-08 09:31:58.000000000 -0700
-+++ iptables-1.4.2/extensions/libxt_owner.c	2009-01-26 14:58:48.846988126 -0800
-@@ -324,7 +324,7 @@
- 		return;
- 	if (info->invert & flag)
- 		printf("! ");
--	printf(label);
-+	printf("%s ", label);
- 
- 	switch (info->match & flag) {
- 	case IPT_OWNER_UID:
-@@ -375,7 +375,7 @@
- 		return;
- 	if (info->invert & flag)
- 		printf("! ");
--	printf(label);
-+	printf("%s ", label);
- 
- 	switch (info->match & flag) {
- 	case IP6T_OWNER_UID:
-diff -Naur iptables-1.4.2.orig/extensions/libxt_TOS.c iptables-1.4.2/extensions/libxt_TOS.c
---- iptables-1.4.2.orig/extensions/libxt_TOS.c	2008-10-08 09:31:58.000000000 -0700
-+++ iptables-1.4.2/extensions/libxt_TOS.c	2009-01-26 14:57:52.122570191 -0800
-@@ -8,6 +8,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <netinet/in.h>
- 
- #include <xtables.h>
- #include <linux/netfilter/xt_DSCP.h>
-diff -Naur iptables-1.4.2.orig/include/xtables.h.in iptables-1.4.2/include/xtables.h.in
---- iptables-1.4.2.orig/include/xtables.h.in	2008-10-08 09:31:58.000000000 -0700
-+++ iptables-1.4.2/include/xtables.h.in	2009-01-26 14:57:30.449986869 -0800
-@@ -5,6 +5,7 @@
- #include <sys/types.h>
- #include <stdbool.h>
- #include <net/if.h>
-+#include <netinet/in.h>
- #include <linux/types.h>
- #include <linux/netfilter/x_tables.h>
- 
-diff -Naur iptables-1.4.2.orig/Makefile.in iptables-1.4.2/Makefile.in
---- iptables-1.4.2.orig/Makefile.in	2008-10-13 05:36:47.000000000 -0700
-+++ iptables-1.4.2/Makefile.in	2009-01-26 14:58:29.770686408 -0800
-@@ -87,7 +87,7 @@
- 	"$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(includedir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
--libxtables_la_LIBADD =
-+libxtables_la_DEPENDENCIES =
- am_libxtables_la_OBJECTS = xtables.lo
- libxtables_la_OBJECTS = $(am_libxtables_la_OBJECTS)
- binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-@@ -353,11 +353,12 @@
- lib_LTLIBRARIES = libxtables.la
- libxtables_la_SOURCES = xtables.c
- libxtables_la_LDFLAGS = -version 0:0:0
-+libxtables_la_LIBADD = -ldl
- 
- # iptables, dynamic
- iptables_SOURCES = iptables-standalone.c iptables.c
- iptables_LDFLAGS = -rdynamic
--iptables_LDADD = -ldl -lm libiptc/libiptc.a extensions/libext4.a libxtables.la
-+iptables_LDADD = libiptc/libiptc.a extensions/libext4.a libxtables.la -ldl -lm
- iptables_multi_SOURCES = iptables-multi.c iptables-save.c \
-                             iptables-restore.c iptables-xml.c \
-                             iptables-standalone.c iptables.c
-@@ -375,13 +376,13 @@
- # iptables-multi, semi-static
- iptables_static_SOURCES = ${iptables_multi_SOURCES} xtables.c
- iptables_static_CFLAGS = ${iptables_multi_CFLAGS} -DNO_SHARED_LIBS=1
--iptables_static_LDADD = -lm libiptc/libiptc.a extensions/libext4.a
-+iptables_static_LDADD = libiptc/libiptc.a extensions/libext4.a -lm
- iptables_xml_SOURCES = iptables-xml.c
- 
- # ip6tables, dynamic
- ip6tables_SOURCES = ip6tables-standalone.c ip6tables.c
- ip6tables_LDFLAGS = -rdynamic
--ip6tables_LDADD = -ldl -lm libiptc/libiptc.a extensions/libext6.a libxtables.la
-+ip6tables_LDADD = libiptc/libiptc.a extensions/libext6.a libxtables.la -ldl -lm
- ip6tables_multi_SOURCES = ip6tables-multi.c ip6tables-save.c \
-                             ip6tables-restore.c ip6tables-standalone.c \
-                             ip6tables.c
-@@ -399,7 +400,7 @@
- # iptables-multi, semi-static
- ip6tables_static_SOURCES = ${ip6tables_multi_SOURCES} xtables.c
- ip6tables_static_CFLAGS = ${ip6tables_multi_CFLAGS} -DNO_SHARED_LIBS=1
--ip6tables_static_LDADD = -lm libiptc/libiptc.a extensions/libext6.a
-+ip6tables_static_LDADD = libiptc/libiptc.a extensions/libext6.a -lm
- noinst_LIBRARIES := libiptc/libiptc.a
- man_MANS := iptables.8 iptables-restore.8 iptables-save.8 \
-                     iptables-xml.8 ip6tables.8 ip6tables-restore.8 \
-@@ -1529,7 +1530,7 @@
- # ldconfig may fail when we are not root (as is the case in build systems)
- # so add appropriate protection that it does not let `make` fail.
- install-exec-hook:
--	-/sbin/ldconfig || :;
-+	-[ -z "$(DESTDIR)" ] && /sbin/ldconfig
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:

commit 2697c08bac69b2b6ac7ae4ba02605f7178e12974
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date:   Tue Jun 11 09:49:46 2013 -0400

    Remove libnl patch
    
    No longer using old git repo tarball so patch shouldn't be needed.

diff --git a/BOOK/beyond-net/common/libnl.xml b/BOOK/beyond-net/common/libnl.xml
index c035279..76c3a69 100644
--- a/BOOK/beyond-net/common/libnl.xml
+++ b/BOOK/beyond-net/common/libnl.xml
@@ -24,10 +24,6 @@
   <sect2 role="installation">
     <title>Installation of libnl</title>
 
-   <para os="p1">Apply patch to fix a compile and build issue:</para>
-
-    <screen os="p2"><userinput>patch -Np1 -i ../&libnl-fixes-patch;</userinput></screen>
-
     <para os="a">Configure libnl:</para>
 
 <screen os="b"><userinput>CC="${CC} -Os" ./configure --prefix=/usr --host=${CLFS_TARGET}</userinput></screen>
diff --git a/BOOK/beyond-net/common/patches.xml b/BOOK/beyond-net/common/patches.xml
index 67daba0..eed0cb5 100644
--- a/BOOK/beyond-net/common/patches.xml
+++ b/BOOK/beyond-net/common/patches.xml
@@ -26,14 +26,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>Libnl Fixes Patch - <token>&libnl-fixes-patch-size;</token>:</term> <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&libnl-fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&libnl-fixes-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
   </variablelist>
 
   <para os="a">Total size of these patches: about <returnvalue/></para>
diff --git a/BOOK/patches.ent b/BOOK/patches.ent
index ec27b11..412ceba 100644
--- a/BOOK/patches.ent
+++ b/BOOK/patches.ent
@@ -28,10 +28,6 @@
 <!ENTITY iptables-fixes-patch-md5 "5a8bc894706019ea4f42e506633a49bf">
 <!ENTITY iptables-fixes-patch-size "5 KB">
 
-<!ENTITY libnl-fixes-patch "libnl-git-fixes-1.patch">
-<!ENTITY libnl-fixes-patch-md5 "773b0d979f1592f757dd30d47ae179fa">
-<!ENTITY libnl-fixes-patch-size "3 KB">
-
 <!-- ARM Patches -->
 
 <!ENTITY gcc-uclibc-arm-softfloat-patch "gcc-&gcc-version;-uclibc-arm-softfloat-2.patch">
diff --git a/patches/libnl-git-fixes-1.patch b/patches/libnl-git-fixes-1.patch
deleted file mode 100644
index e0f782a..0000000
--- a/patches/libnl-git-fixes-1.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-diff --git a/lib/Makefile.am b/lib/Makefile.am
-index 3c1dca7..1c2ae99 100644
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -3,7 +3,7 @@
- AM_CFLAGS  = -Wall -I${top_srcdir}/include -D_GNU_SOURCE
- 
- lib_LTLIBRARIES = \
--	libnl.la libnl-genl.la libnl-nf.la libnl-route.la
-+	libnl.la libnl-genl.la libnl-route.la libnl-nf.la
- 
- libnl_la_LDFLAGS = -version-info 2:0:0
- libnl_la_SOURCES = \
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 0ffc26f..da2a9f5 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -20,67 +20,67 @@ noinst_PROGRAMS = \
- rtnl_utils_c = rtnl-utils.c utils.c
- 
- genl_ctrl_list_SOURCES = genl-ctrl-list.c ctrl-utils.c utils.c
--genl_ctrl_list_LDADD = -lnl-genl
-+genl_ctrl_list_LDADD = -lnl-genl -lnl
- 
- nf_ct_list_SOURCES = nf-ct-list.c ct-utils.c utils.c
--nf_ct_list_LDADD = -lnl-nf
-+nf_ct_list_LDADD = -lnl-nf -lnl-route -lnl
- nf_log_SOURCES = nf-log.c log-utils.c ${rtnl_utils_c}
--nf_log_LDADD = -lnl-nf
-+nf_log_LDADD = -lnl-nf -lnl-route -lnl
- nf_queue_SOURCES = nf-queue.c queue-utils.c ${rtnl_utils_c}
--nf_queue_LDADD = -lnl-nf
-+nf_queue_LDADD = -lnl-nf -lnl-route -lnl
- 
- addr_c = addr-utils.c ${rtnl_utils_c}
- nl_addr_add_SOURCES = nl-addr-add.c ${addr_c}
--nl_addr_add_LDADD = -lnl-route
-+nl_addr_add_LDADD = -lnl-route -lnl
- nl_addr_delete_SOURCES = nl-addr-delete.c ${addr_c}
--nl_addr_delete_LDADD = -lnl-route
-+nl_addr_delete_LDADD = -lnl-route -lnl
- nl_addr_list_SOURCES = nl-addr-list.c ${addr_c}
--nl_addr_list_LDADD = -lnl-route
-+nl_addr_list_LDADD = -lnl-route -lnl
- 
- link_c = link-utils.c ${rtnl_utils_c}
- nl_link_list_SOURCES = nl-link-list.c ${link_c}
--nl_link_list_LDADD = -lnl-route
-+nl_link_list_LDADD = -lnl-route -lnl
- nl_link_set_SOURCES = nl-link-set.c ${link_c}
--nl_link_set_LDADD = -lnl-route
-+nl_link_set_LDADD = -lnl-route -lnl
- nl_link_stats_SOURCES = nl-link-stats.c ${link_c}
--nl_link_stats_LDADD = -lnl-route
-+nl_link_stats_LDADD = -lnl-route -lnl
- nl_link_ifindex2name_SOURCES = nl-link-ifindex2name.c ${rtnl_utils_c}
--nl_link_ifindex2name_LDADD = -lnl-route
-+nl_link_ifindex2name_LDADD = -lnl-route -lnl
- nl_link_name2ifindex_SOURCES = nl-link-name2ifindex.c ${rtnl_utils_c}
--nl_link_name2ifindex_LDADD = -lnl-route
-+nl_link_name2ifindex_LDADD = -lnl-route -lnl
- 
- nl_monitor_SOURCES = nl-monitor.c ${rtnl_utils_c}
--nl_monitor_LDADD = -lnl-route
-+nl_monitor_LDADD = -lnl-route -lnl
- 
- neigh_c = neigh-utils.c ${rtnl_utils_c}
- nl_neigh_add_SOURCES = nl-neigh-add.c ${neigh_c}
--nl_neigh_add_LDADD = -lnl-route
-+nl_neigh_add_LDADD = -lnl-route -lnl
- nl_neigh_delete_SOURCES = nl-neigh-delete.c ${neigh_c}
--nl_neigh_delete_LDADD = -lnl-route
-+nl_neigh_delete_LDADD = -lnl-route -lnl
- nl_neigh_list_SOURCES = nl-neigh-list.c ${neigh_c}
--nl_neigh_list_LDADD = -lnl-route
-+nl_neigh_list_LDADD = -lnl-route -lnl
- 
- nl_neightbl_list_SOURCES = nl-neightbl-list.c ${rtnl_utils_c}
--nl_neightbl_list_LDADD = -lnl-route
-+nl_neightbl_list_LDADD = -lnl-route -lnl
- 
- qdisc_c = qdisc-utils.c ${rtnl_utils_c}
- nl_qdisc_delete_SOURCES = nl-qdisc-delete.c ${qdisc_c}
--nl_qdisc_delete_LDADD = -lnl-route
-+nl_qdisc_delete_LDADD = -lnl-route -lnl
- nl_qdisc_list_SOURCES = nl-qdisc-list.c ${qdisc_c}
--nl_qdisc_list_LDADD = -lnl-route
-+nl_qdisc_list_LDADD = -lnl-route -lnl
- 
- route_c = route-utils.c ${rtnl_utils_c}
- nl_route_add_SOURCES = nl-route-add.c ${route_c}
--nl_route_add_LDADD = -lnl-route
-+nl_route_add_LDADD = -lnl-route -lnl
- nl_route_delete_SOURCES = nl-route-delete.c ${route_c}
--nl_route_delete_LDADD = -lnl-route
-+nl_route_delete_LDADD = -lnl-route -lnl
- nl_route_get_SOURCES = nl-route-get.c ${route_c}
--nl_route_get_LDADD = -lnl-route
-+nl_route_get_LDADD = -lnl-route -lnl
- nl_route_list_SOURCES = nl-route-list.c ${route_c}
--nl_route_list_LDADD = -lnl-route
-+nl_route_list_LDADD = -lnl-route -lnl
- 
- nl_rule_list_SOURCES = nl-rule-list.c rule-utils.c ${rtnl_utils_c}
--nl_rule_list_LDADD = -lnl-route
-+nl_rule_list_LDADD = -lnl-route -lnl
- 
- nl_tctree_list_SOURCES = nl-tctree-list.c ${rtnl_utils_c}
--nl_tctree_list_LDADD = -lnl-route
-+nl_tctree_list_LDADD = -lnl-route -lnl

commit d1a50594b45f4142fdd8c045bd1ff89bcde108e4
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date:   Tue Jun 11 09:47:33 2013 -0400

    packages: Update libnl to 3.2.22

diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index 8442279..63ee6ab 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -88,11 +88,11 @@
 <!ENTITY iptables-md5 "be97ce9007fa42c867901b496c935a0a">
 <!ENTITY iptables-home "http://www.netfilter.org/projects/iptables/">
 
-<!ENTITY libnl-version "git-gdc273a12d">
-<!ENTITY libnl-size "1217 KB">
-<!ENTITY libnl-url "http://cross-lfs.org/~mlankhorst/libnl-git.tar.bz2">
-<!ENTITY libnl-md5 "6eda026344cffb21f334ec20cdb82d5a">
-<!ENTITY libnl-home "http://git.kernel.org/?p=libs/netlink/libnl.git">
+<!ENTITY libnl-version "3.2.22">
+<!ENTITY libnl-size "713 KB">
+<!ENTITY libnl-url "http://http://www.carisma.slowglass.com/~tgr/libnl/files/libnl-&libnl-version;.tar.gz">
+<!ENTITY libnl-md5 "2e1c889494d274aca24ce5f6a748e66e">
+<!ENTITY libnl-home "http://www.carisma.slowglass.com/~tgr/libnl/">
 
 <!ENTITY hostapd-version "2.0">
 <!ENTITY hostapd-size "1343 KB">

commit 7863860022fff23f7335e614a2066296b94eea48
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date:   Tue Jun 11 09:43:44 2013 -0400

    packages: Update iptables to 1.4.19.1

diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index f8e13e3..8442279 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -82,10 +82,10 @@
 <!ENTITY dropbear-md5 "8d3579bbbfcea48404a3219643076450">
 <!ENTITY dropbear-home "http://matt.ucc.asn.au/dropbear/dropbear.html">
 
-<!ENTITY iptables-version "1.4.2">
-<!ENTITY iptables-size "428 KB">
+<!ENTITY iptables-version "1.4.19.1">
+<!ENTITY iptables-size "531 KB">
 <!ENTITY iptables-url "http://www.netfilter.org/projects/iptables/files/iptables-&iptables-version;.tar.bz2">
-<!ENTITY iptables-md5 "a138d1c2e74321e0e4e228a9fb301c9a">
+<!ENTITY iptables-md5 "be97ce9007fa42c867901b496c935a0a">
 <!ENTITY iptables-home "http://www.netfilter.org/projects/iptables/">
 
 <!ENTITY libnl-version "git-gdc273a12d">

commit cade83031e6d2dc3a787560debecf06065055244
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date:   Tue Jun 11 09:42:10 2013 -0400

    packages: Update dropbear to 2013.58

diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index 397f9b5..f8e13e3 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -76,10 +76,10 @@
 
 <!-- Beyond CLFS networking packages -->
 
-<!ENTITY dropbear-version "0.52">
-<!ENTITY dropbear-size "1,568 KB">
-<!ENTITY dropbear-url "http://matt.ucc.asn.au/dropbear/releases/dropbear-&dropbear-version;.tar.gz">
-<!ENTITY dropbear-md5 "a1fc7adf601bca53330a792a9c873439">
+<!ENTITY dropbear-version "2013.58">
+<!ENTITY dropbear-size "1543 KB">
+<!ENTITY dropbear-url "http://matt.ucc.asn.au/dropbear/releases/dropbear-&dropbear-version;.tar.bz2">
+<!ENTITY dropbear-md5 "8d3579bbbfcea48404a3219643076450">
 <!ENTITY dropbear-home "http://matt.ucc.asn.au/dropbear/dropbear.html">
 
 <!ENTITY iptables-version "1.4.2">

commit a040561b34944e14556e4a598c5c92184d7bb8a1
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date:   Tue Jun 11 09:39:37 2013 -0400

    packages: Update hostapd to 2.0

diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index 21adee8..397f9b5 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -94,10 +94,10 @@
 <!ENTITY libnl-md5 "6eda026344cffb21f334ec20cdb82d5a">
 <!ENTITY libnl-home "http://git.kernel.org/?p=libs/netlink/libnl.git">
 
-<!ENTITY hostapd-version "git-gcfaab58007">
-<!ENTITY hostapd-size "10744 KB">
-<!ENTITY hostapd-url "http://cross-lfs.org/~mlankhorst/hostap-git.tar.bz2">
-<!ENTITY hostapd-md5 "4fa27f467c10de67fda451396fb6f854">
+<!ENTITY hostapd-version "2.0">
+<!ENTITY hostapd-size "1343 KB">
+<!ENTITY hostapd-url "http://hostap.epitest.fi/releases/hostapd-&hostapd-version;.tar.gz">
+<!ENTITY hostapd-md5 "ba22e639bc57aa4035d2ea8ffa9bbbee">
 <!ENTITY hostapd-home "http://hostap.epitest.fi/">
 
 <!ENTITY wireless_tools-version "29">

commit 766b7b406b866ebdb254b5fb2e63d9cc9ede5fb0
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date:   Tue Jun 11 09:34:30 2013 -0400

    packages: Update zlib to 1.2.8

diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index 2a13dde..21adee8 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -68,10 +68,10 @@
 
 <!-- Beyond CLFS library packages -->
 
-<!ENTITY zlib-version "1.2.5">
-<!ENTITY zlib-size "532 KB">
+<!ENTITY zlib-version "1.2.8">
+<!ENTITY zlib-size "557 KB">
 <!ENTITY zlib-url "&sourceforge;libpng/zlib-&zlib-version;.tar.gz">
-<!ENTITY zlib-md5 "c735eab2d659a96e5a594c9e8541ad63">
+<!ENTITY zlib-md5 "44d667c142d7cda120332623eab69f40">
 <!ENTITY zlib-home "http://www.zlib.net">
 
 <!-- Beyond CLFS networking packages -->

commit 402e2e3db8adae1e94cbb62dac056ad076ac3d9a
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date:   Tue Jun 11 09:31:09 2013 -0400

    Remove system-build section from x86, arm and mips
    
    It was empty, only wrt has anything useful inside.

diff --git a/BOOK/arm-index.xml b/BOOK/arm-index.xml
index 57e0b7b..ce53f63 100644
--- a/BOOK/arm-index.xml
+++ b/BOOK/arm-index.xml
@@ -44,7 +44,6 @@
     <title>Building the CLFS System</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/arm-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="system-build/arm-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/arm-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootloaders/arm-chapter.xml"/>
diff --git a/BOOK/mips-index.xml b/BOOK/mips-index.xml
index 890ec3a..cea9c36 100644
--- a/BOOK/mips-index.xml
+++ b/BOOK/mips-index.xml
@@ -44,7 +44,6 @@
     <title>Building the CLFS System</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/mips-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="system-build/mips-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/mips-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootloaders/mips-chapter.xml"/>
diff --git a/BOOK/system-build/arm-chapter.xml b/BOOK/system-build/arm-chapter.xml
deleted file mode 100644
index 74b22df..0000000
--- a/BOOK/system-build/arm-chapter.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-systembuild" xreflabel="System Build">
-  <?dbhtml dir="systembuild"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>System Build</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-
-</chapter>
diff --git a/BOOK/system-build/mips-chapter.xml b/BOOK/system-build/mips-chapter.xml
deleted file mode 100644
index 74b22df..0000000
--- a/BOOK/system-build/mips-chapter.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-systembuild" xreflabel="System Build">
-  <?dbhtml dir="systembuild"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>System Build</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-
-</chapter>
diff --git a/BOOK/system-build/x86-chapter.xml b/BOOK/system-build/x86-chapter.xml
deleted file mode 100644
index 74b22df..0000000
--- a/BOOK/system-build/x86-chapter.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-systembuild" xreflabel="System Build">
-  <?dbhtml dir="systembuild"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>System Build</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-
-</chapter>
diff --git a/BOOK/x86-index.xml b/BOOK/x86-index.xml
index 2cfdc1a..d79cf69 100644
--- a/BOOK/x86-index.xml
+++ b/BOOK/x86-index.xml
@@ -45,7 +45,6 @@
     <title>Building the CLFS System</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/x86-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="system-build/x86-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/x86-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootloaders/x86-chapter.xml"/>

commit 78b14838452ca451822c18572292c98f6c0ca536
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date:   Mon Jun 10 10:37:34 2013 -0400

    Makefile: Remove 'lfs' target
    
    It's the same as the 'clfs' target

diff --git a/BOOK/Makefile b/BOOK/Makefile
index 4cceea4..6f07b24 100644
--- a/BOOK/Makefile
+++ b/BOOK/Makefile
@@ -25,8 +25,8 @@ else
   Q = @
 endif
 
-.PHONY: clfs lfs
-clfs lfs: html
+.PHONY: clfs
+clfs: html
 
 .PHONY: tidy tidy-f tidy-d
 ifeq ($(shell which tidy >/dev/null 2>&1 && echo yes),yes)
@@ -200,7 +200,7 @@ help:
 	@echo "Output: $(RENDERDIR)"
 	@echo
 	@echo "HTML Targets"
-	@echo "  $(FG_GREEN)clfs lfs tidy html render titlepage $(FG_BLUE)$(ARCHS_HTML)$(FG_DEFAULT)"
+	@echo "  $(FG_GREEN)clfs tidy html render titlepage $(FG_BLUE)$(ARCHS_HTML)$(FG_DEFAULT)"
 	@echo
 	@echo "NoChunks Targets"
 	@echo "  $(FG_GREEN)nochunks tidy $(FG_BLUE)$(ARCHS_NOCHUNKS)$(FG_DEFAULT)"

commit 16ed8d6c03e74c5da85f811f0c3b7b52dae74491
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date:   Mon Jun 10 08:53:27 2013 -0400

    Remove System Prep for arm, mips, and x86
    
    Only WRT uses it, it's empty for all others thus not needed.

diff --git a/BOOK/arm-index.xml b/BOOK/arm-index.xml
index 7b77a89..57e0b7b 100644
--- a/BOOK/arm-index.xml
+++ b/BOOK/arm-index.xml
@@ -27,7 +27,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="partitioning/arm-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="materials/arm-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-preps/chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="system-prep/arm-chapter.xml"/>
   </part>
 
   <part id="part3">
diff --git a/BOOK/mips-index.xml b/BOOK/mips-index.xml
index 7329342..890ec3a 100644
--- a/BOOK/mips-index.xml
+++ b/BOOK/mips-index.xml
@@ -27,7 +27,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="partitioning/mips-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="materials/mips-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-preps/chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="system-prep/mips-chapter.xml"/>
   </part>
 
   <part id="part3">
diff --git a/BOOK/system-prep/arm-chapter.xml b/BOOK/system-prep/arm-chapter.xml
deleted file mode 100644
index b24df62..0000000
--- a/BOOK/system-prep/arm-chapter.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-systemprep" xreflabel="System Prep">
-  <?dbhtml dir="systemprep"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>System Prep</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-
-</chapter>
diff --git a/BOOK/system-prep/mips-chapter.xml b/BOOK/system-prep/mips-chapter.xml
deleted file mode 100644
index b24df62..0000000
--- a/BOOK/system-prep/mips-chapter.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-systemprep" xreflabel="System Prep">
-  <?dbhtml dir="systemprep"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>System Prep</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-
-</chapter>
diff --git a/BOOK/system-prep/x86-chapter.xml b/BOOK/system-prep/x86-chapter.xml
deleted file mode 100644
index b24df62..0000000
--- a/BOOK/system-prep/x86-chapter.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-systemprep" xreflabel="System Prep">
-  <?dbhtml dir="systemprep"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>System Prep</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-
-</chapter>
diff --git a/BOOK/x86-index.xml b/BOOK/x86-index.xml
index dd12b76..2cfdc1a 100644
--- a/BOOK/x86-index.xml
+++ b/BOOK/x86-index.xml
@@ -27,7 +27,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="partitioning/x86-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="materials/x86-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-preps/chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="system-prep/x86-chapter.xml"/>
 
   </part>
 

commit dffb50340f4ed38531cc28a4373a879108e35f26
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date:   Fri Jun 7 15:14:10 2013 -0400

    packages: Update uClibc to 0.9.33.2

diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index ef90e22..2a13dde 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -60,10 +60,10 @@
 <!ENTITY mpfr-md5 "ee2c3ac63bf0c2359bf08fc3ee094c19">
 <!ENTITY mpfr-home "http://www.mpfr.org/">
 
-<!ENTITY uclibc-version "0.9.31">
-<!ENTITY uclibc-size "2,244 KB">
+<!ENTITY uclibc-version "0.9.33.2">
+<!ENTITY uclibc-size "2767 KB">
 <!ENTITY uclibc-url "http://www.uclibc.org/downloads/uClibc-&uclibc-version;.tar.bz2">
-<!ENTITY uclibc-md5 "52fb8a494758630c8d3ddd7f1e0daafd">
+<!ENTITY uclibc-md5 "a338aaffc56f0f5040e6d9fa8a12eda1">
 <!ENTITY uclibc-home "http://uclibc.org/">
 
 <!-- Beyond CLFS library packages -->

commit 705ef4987b0badfb90b43c15cad5a05f26648284
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date:   Fri Jun 7 15:11:09 2013 -0400

    packages: Update mpfr to 3.1.2

diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index 661bcb4..ef90e22 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -53,11 +53,11 @@
 <!ENTITY mpc-md5 "b32a2e1a3daa392372fbd586d1ed3679">
 <!ENTITY mpc-home "http://www.multiprecision.org/">
 
-<!ENTITY mpfr-version "3.0.0">
-<!ENTITY mpfr-size "1,112 KB">
-<!ENTITY mpfr-dlid "27105">
+<!ENTITY mpfr-version "3.1.2">
+<!ENTITY mpfr-size "1196 KB">
+<!ENTITY mpfr-dlid "32210">
 <!ENTITY mpfr-url "http://gforge.inria.fr/frs/download.php/&mpfr-dlid;/mpfr-&mpfr-version;.tar.bz2">
-<!ENTITY mpfr-md5 "f45bac3584922c8004a10060ab1a8f9f">
+<!ENTITY mpfr-md5 "ee2c3ac63bf0c2359bf08fc3ee094c19">
 <!ENTITY mpfr-home "http://www.mpfr.org/">
 
 <!ENTITY uclibc-version "0.9.31">

commit 3ec0aae3a6cba9ae0eab3b76c5fb6d0a170fc10a
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date:   Fri Jun 7 15:05:42 2013 -0400

    packages: Update MPC to 1.0.1

diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index 822f9b7..661bcb4 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -47,10 +47,10 @@
 <!ENTITY linux-md5 "bf912b05870cd04ca620594e2b264a3c">
 <!ENTITY linux-home "http://www.kernel.org">
 
-<!ENTITY mpc-version "0.9">
-<!ENTITY mpc-size "553 KB">
+<!ENTITY mpc-version "1.0.1">
+<!ENTITY mpc-size "609 KB">
 <!ENTITY mpc-url "http://www.multiprecision.org/mpc/download/mpc-&mpc-version;.tar.gz">
-<!ENTITY mpc-md5 "0d6acab8d214bd7d1fbbc593e83dd00d">
+<!ENTITY mpc-md5 "b32a2e1a3daa392372fbd586d1ed3679">
 <!ENTITY mpc-home "http://www.multiprecision.org/">
 
 <!ENTITY mpfr-version "3.0.0">

commit 3aa06353a78b7b87245625f355d682013de14429
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date:   Fri Jun 7 15:03:30 2013 -0400

    packages: Update Linux to 3.0.80

diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index f53df75..822f9b7 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -40,12 +40,11 @@
 <!ENTITY iana-etc-md5 "3ba3afb1d1b261383d247f46cb135ee8">
 <!ENTITY iana-etc-home "http://sethwklein.net/iana-etc">
 
-<!ENTITY linux-dl-version "2.6">
-
-<!ENTITY linux-version "2.6.38.2">
-<!ENTITY linux-size "73,037 KB">
+<!ENTITY linux-dl-version "3.x">
+<!ENTITY linux-version "3.0.80">
+<!ENTITY linux-size "75134 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-dl-version;/linux-&linux-version;.tar.bz2">
-<!ENTITY linux-md5 "5e9d0edae15053ea9acd932e6d162d03">
+<!ENTITY linux-md5 "bf912b05870cd04ca620594e2b264a3c">
 <!ENTITY linux-home "http://www.kernel.org">
 
 <!ENTITY mpc-version "0.9">

commit 36dec8b4190561f98c5dcf3e69682f3cef418e8a
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date:   Fri Jun 7 15:00:20 2013 -0400

    packages: Update iana-etc download link
    
    sethwklein.net is back up!

diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index b70eec3..f53df75 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -36,7 +36,7 @@
 
 <!ENTITY iana-etc-version "2.30">
 <!ENTITY iana-etc-size "200 KB">
-<!ENTITY iana-etc-url "&packages-root;iana-etc-&iana-etc-version;.tar.bz2">
+<!ENTITY iana-etc-url "http://sethwklein.net/iana-etc-&iana-etc-version;.tar.bz2">
 <!ENTITY iana-etc-md5 "3ba3afb1d1b261383d247f46cb135ee8">
 <!ENTITY iana-etc-home "http://sethwklein.net/iana-etc">
 

commit abdff1e5652907290908f5ae86dde2c614d6e732
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date:   Fri Jun 7 14:57:58 2013 -0400

    packages: Update GMP to 5.1.2

diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index 1db3e1b..b70eec3 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -28,10 +28,10 @@
 <!ENTITY gcc-md5 "86f428a30379bdee0224e353ee2f999e">
 <!ENTITY gcc-home "http://gcc.gnu.org">
 
-<!ENTITY gmp-version "5.0.1">
-<!ENTITY gmp-size "1,960 KB">
+<!ENTITY gmp-version "5.1.2">
+<!ENTITY gmp-size "2143 KB">
 <!ENTITY gmp-url "&gnu;gmp/gmp-&gmp-version;.tar.bz2">
-<!ENTITY gmp-md5 "6bac6df75c192a13419dfd71d19240a7">
+<!ENTITY gmp-md5 "7e3516128487956cd825fef01aafe4bc">
 <!ENTITY gmp-home "http://gmplib.org/">
 
 <!ENTITY iana-etc-version "2.30">

commit d97ea33bb1b5f0921854edf720c2ee5c2ca33cab
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date:   Fri Jun 7 14:53:46 2013 -0400

    packages: Update GCC to 4.7.3

diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index 65a217f..1db3e1b 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -22,10 +22,10 @@
 <!ENTITY clfs-bootscripts-md5 "N/A">
 <!ENTITY clfs-bootscripts-home "http://git.cross-lfs.org/?p=bootscripts-embedded.git">
 
-<!ENTITY gcc-version "4.6.0">
-<!ENTITY gcc-size "69,902 KB">
+<!ENTITY gcc-version "4.7.3">
+<!ENTITY gcc-size "80961 KB">
 <!ENTITY gcc-url "ftp://gcc.gnu.org/pub/gcc/releases/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2">
-<!ENTITY gcc-md5 "93d1c436bf991564524701259b6285a2">
+<!ENTITY gcc-md5 "86f428a30379bdee0224e353ee2f999e">
 <!ENTITY gcc-home "http://gcc.gnu.org">
 
 <!ENTITY gmp-version "5.0.1">

commit f14d2fe04b6a12e4a6b381a27ce66e903c5ad019
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date:   Fri Jun 7 14:50:03 2013 -0400

    packages: Use bootscripts from git master HEAD
    
    Download a snapshot of the current git master branch HEAD, in tar.gz
    format.  No md5sum is given as it will change with every commit.

diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index 8c3315c..65a217f 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -16,11 +16,11 @@
 <!ENTITY busybox-md5 "d613f2e4b580305c1de8691f7b84285e">
 <!ENTITY busybox-home "http://www.busybox.net">
 
-<!ENTITY clfs-bootscripts-version "1.0-pre5">
-<!ENTITY clfs-bootscripts-size "4 KB">
-<!ENTITY clfs-bootscripts-url "&packages-root;clfs-embedded-bootscripts-&clfs-bootscripts-version;.tar.bz2">
-<!ENTITY clfs-bootscripts-md5 "e20e3e285fb7fe3ff941e3e505f96023">
-<!ENTITY clfs-bootscripts-home " ">
+<!ENTITY clfs-bootscripts-version "git master HEAD">
+<!ENTITY clfs-bootscripts-size "5 KB">
+<!ENTITY clfs-bootscripts-url "http://git.cross-lfs.org/?p=bootscripts-embedded.git;a=snapshot;h=HEAD;sf=tgz">
+<!ENTITY clfs-bootscripts-md5 "N/A">
+<!ENTITY clfs-bootscripts-home "http://git.cross-lfs.org/?p=bootscripts-embedded.git">
 
 <!ENTITY gcc-version "4.6.0">
 <!ENTITY gcc-size "69,902 KB">

commit b057e2d41814ae78d0f4e4066ee588a5409b5767
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date:   Fri Jun 7 14:47:09 2013 -0400

    packages: Update busybox to 1.21.0

diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index dfe69d2..8c3315c 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -10,10 +10,10 @@
 <!ENTITY binutils-md5 "4f8fa651e35ef262edc01d60fb45702e">
 <!ENTITY binutils-home "http://www.gnu.org/software/binutils/">
 
-<!ENTITY busybox-version "1.18.4">
-<!ENTITY busybox-size "2,081 KB">
+<!ENTITY busybox-version "1.21.0">
+<!ENTITY busybox-size "2149 KB">
 <!ENTITY busybox-url "http://busybox.net/downloads/busybox-&busybox-version;.tar.bz2">
-<!ENTITY busybox-md5 "b03c5b46ced732679e525a920a1a62f5">
+<!ENTITY busybox-md5 "d613f2e4b580305c1de8691f7b84285e">
 <!ENTITY busybox-home "http://www.busybox.net">
 
 <!ENTITY clfs-bootscripts-version "1.0-pre5">

commit 4859af8a2f43448438298d0c41a9286e15df1aef
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date:   Fri Jun 7 14:45:19 2013 -0400

    packages: Update binutils to 2.23.2

diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index 20a6c7d..dfe69d2 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -4,11 +4,11 @@
 
 <!-- Note: For empty *-home entities use " " not "" -->
 
-<!ENTITY binutils-version "2.21">
-<!ENTITY binutils-size "18,304 KB">
+<!ENTITY binutils-version "2.23.2">
+<!ENTITY binutils-size "20937 KB">
 <!ENTITY binutils-url "&gnu;binutils/binutils-&binutils-version;.tar.bz2">
-<!ENTITY binutils-md5 "c84c5acc9d266f1a7044b51c85a823f5">
-<!ENTITY binutils-home "http://sourceware.org/binutils/">
+<!ENTITY binutils-md5 "4f8fa651e35ef262edc01d60fb45702e">
+<!ENTITY binutils-home "http://www.gnu.org/software/binutils/">
 
 <!ENTITY busybox-version "1.18.4">
 <!ENTITY busybox-size "2,081 KB">

commit 833b9a50eda7650703b1ce417ec176e3b2e44534
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date:   Fri Jun 7 14:35:01 2013 -0400

    hostreqs: Extend last cut of glibc version check
    
    To ensure newer versions of glibc, like Arch Linux, show the full
    version number.

diff --git a/BOOK/prologue/common/hostreqs.xml b/BOOK/prologue/common/hostreqs.xml
index cc0ace4..486adb4 100644
--- a/BOOK/prologue/common/hostreqs.xml
+++ b/BOOK/prologue/common/hostreqs.xml
@@ -97,7 +97,8 @@ diff --version | head -n1
 find --version | head -n1
 gawk --version | head -n1
 gcc --version | head -n1
-ldd $(which ${SHELL}) | grep libc.so | cut -d ' ' -f 3 | ${SHELL} | head -n 1 | cut -d ' ' -f 1-7
+ldd $(which ${SHELL}) | grep libc.so | cut -d ' ' -f 3 | ${SHELL} | head -n 1 \
+| cut -d ' ' -f 1-10
 grep --version | head -n1
 gzip --version | head -n1
 make --version | head -n1

commit 5e492c0733a20f95acaf74893f7a09e500b599a1
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date:   Fri Jun 7 14:29:18 2013 -0400

    hostreqs: Update to minimum of Debian Squeeze
    
    Squeeze goes end of support life in < 1 year and it already had quite
    old software packaged in it.  Testing against even older versions than
    what Debian ships seems unlikely to be useful or possible for much
    longer.

diff --git a/BOOK/prologue/common/hostreqs.xml b/BOOK/prologue/common/hostreqs.xml
index 00eae3e..cc0ace4 100644
--- a/BOOK/prologue/common/hostreqs.xml
+++ b/BOOK/prologue/common/hostreqs.xml
@@ -11,7 +11,7 @@
   <title>Host System Requirements</title>
 
     <para>You should be able to build a CLFS system from just about any
-    Unix-type operating system. Your host system should have the following
+    recent Linux distrubtion. Your host system should have the following
     software with the minimum versions indicated. Also note that many
     distributions will place software headers into separate packages, often in
     the form of <quote>[package-name]-devel</quote> or
@@ -21,30 +21,27 @@
   <itemizedlist spacing="compact">
 
     <listitem>
-      <para><emphasis role="strong">Bash-2.05a</emphasis></para>
+      <para><emphasis role="strong">Bash 4.0</emphasis></para>
     </listitem>
 
     <listitem>
-      <para><emphasis role="strong">Binutils-2.12</emphasis> (Versions
-      greater than &binutils-version; are not recommended as they have
-      not been tested)</para>
+      <para><emphasis role="strong">Binutils-2.20</emphasis></para>
     </listitem>
 
     <listitem>
-      <para><emphasis role="strong">Bzip2-1.0.2</emphasis></para>
+      <para><emphasis role="strong">Bzip2-1.0.5</emphasis></para>
     </listitem>
 
     <listitem>
-      <para><emphasis role="strong">Coreutils-5.0</emphasis> (or Sh-Utils-2.0,
-      Textutils-2.0, and Fileutils-4.1)</para>
+      <para><emphasis role="strong">Coreutils-8.1</emphasis></para>
     </listitem>
 
     <listitem>
-      <para><emphasis role="strong">Diffutils-2.8</emphasis></para>
+      <para><emphasis role="strong">Diffutils-3.0</emphasis></para>
     </listitem>
 
     <listitem>
-      <para><emphasis role="strong">Findutils-4.1.20</emphasis></para>
+      <para><emphasis role="strong">Findutils-4.4.0</emphasis></para>
     </listitem>
 
     <listitem>
@@ -52,39 +49,35 @@
     </listitem>
 
     <listitem>
-      <para><emphasis role="strong">Gcc-2.95.3</emphasis> (Versions
-      greater than &gcc-version; are not recommended as they have not
-      been tested)</para>
+      <para><emphasis role="strong">Gcc-4.4</emphasis></para>
     </listitem>
 
     <listitem>
-      <para><emphasis role="strong">Glibc-2.2.5</emphasis> (or EGLIBC.
-      Versions greater than 2.11 are not recommended as they have
-      not been tested)</para>
+      <para><emphasis role="strong">Glibc-2.11</emphasis></para>
     </listitem>
 
     <listitem>
-      <para><emphasis role="strong">Grep-2.5</emphasis></para>
+      <para><emphasis role="strong">Grep-2.6</emphasis></para>
     </listitem>
 
     <listitem>
-      <para><emphasis role="strong">Gzip-1.2.4</emphasis></para>
+      <para><emphasis role="strong">Gzip-1.3</emphasis></para>
     </listitem>
 
     <listitem>
-      <para><emphasis role="strong">Make-3.79.1</emphasis></para>
+      <para><emphasis role="strong">Make-3.81</emphasis></para>
     </listitem>
 
     <listitem>
-      <para><emphasis role="strong">Patch-2.5.4</emphasis></para>
+      <para><emphasis role="strong">Patch-2.6</emphasis></para>
     </listitem>
 
     <listitem>
-      <para><emphasis role="strong">Sed-3.0.2</emphasis></para>
+      <para><emphasis role="strong">Sed-4.2.1</emphasis></para>
     </listitem>
 
     <listitem>
-      <para><emphasis role="strong">Tar-1.14</emphasis></para>
+      <para><emphasis role="strong">Tar-1.23</emphasis></para>
     </listitem>
 
   </itemizedlist>

commit 8d661ecbb541f8a19d9d0973e4286365ece74989
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date:   Fri Jun 7 11:49:05 2013 -0400

    Remove the-end/getcounted
    
    The counter is for LFS and does not allow selection of CLFS, especially
    CLFS embedded versions, thus it's not useful.

diff --git a/BOOK/the-end/chapter.xml b/BOOK/the-end/chapter.xml
index 96c9766..06f7437 100644
--- a/BOOK/the-end/chapter.xml
+++ b/BOOK/the-end/chapter.xml
@@ -12,7 +12,6 @@
   <title>The End</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="theend.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="getcounted.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="boot.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="whatnow.xml"/>
 
diff --git a/BOOK/the-end/getcounted.xml b/BOOK/the-end/getcounted.xml
deleted file mode 100644
index 6ab4b9c..0000000
--- a/BOOK/the-end/getcounted.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-finish-getcounted">
-  <?dbhtml filename="getcounted.html"?>
-
-  <title>Get Counted</title>
-
-  <para>Now that you have finished the book, do you want to be counted
-  as an LFS user? Head over to <ulink
-  url="&lfs-root;cgi-bin/lfscounter.cgi"/> and register as an LFS user
-  by entering your name and the first LFS version you have used.</para>
-
-  <para>Let's boot into LFS now.</para>
-
-</sect1>

commit 6935fe60c70302cfa6d7b3d7071e86ef6f971608
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date:   Fri Jun 7 11:46:23 2013 -0400

    Remove acknowledgments
    
    They were all from LFS, not CLFS, and mentioned lots of things that only
    apply to LFS itself, thus they were out of date and not accurate for the
    CLFS project.

diff --git a/BOOK/appendices/acknowledgments.xml b/BOOK/appendices/acknowledgments.xml
deleted file mode 100644
index ae5ba9c..0000000
--- a/BOOK/appendices/acknowledgments.xml
+++ /dev/null
@@ -1,421 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<appendix id="appendixb" xreflabel="Appendix B">
-  <?dbhtml dir="appendices"?>
-  <?dbhtml filename="acknowledgements.html"?>
-
-  <title>Acknowledgments</title>
-
-  <para>We would like to thank the following people and organizations
-  for their contributions to the Linux From Scratch Project.</para>
-
-  <itemizedlist>
-
-    <listitem>
-      <para><ulink url="mailto:gerard at linuxfromscratch.org">Gerard
-      Beekmans</ulink> <gerard at linuxfromscratch.org> –
-      LFS Creator, LFS Project Leader</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:matthew at linuxfromscratch.org">Matthew
-      Burgess</ulink> <matthew at linuxfromscratch.org> –
-      LFS Project Leader, LFS Technical Writer/Editor, LFS Release
-      Manager</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:archaic at linuxfromscratch.org">Archaic</ulink>
-      <archaic at linuxfromscratch.org> – LFS Technical Writer/Editor,
-      HLFS Project Leader, BLFS Editor, Hints and Patches Project
-      Maintainer</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:nathan at linuxfromscratch.org">Nathan
-      Coulson</ulink> <nathan at linuxfromscratch.org> –
-      LFS-Bootscripts Maintainer</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:bdubbs at linuxfromscratch.org">Bruce
-      Dubbs</ulink> <bdubbs at linuxfromscratch.org> – BLFS Project
-      Leader</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:manuel at linuxfromscratch.org">Manuel
-      Canales Esparcia</ulink> <manuel at linuxfromscratch.org> –
-      LFS/BLFS/HLFS XML and XSL Maintainer</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:jim at linuxfromscratch.org">Jim
-      Gifford</ulink> <jim at linuxfromscratch.org> – LFS Technical
-      Writer, Patches Project Leader</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:jhuntwork at linuxfromscratch.org">Jeremy
-      Huntwork</ulink> <jhuntwork at linuxfromscratch.org> – LFS
-      Technical Writer, LFS LiveCD Maintainer, ALFS Project Leader</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:lizardo at linuxfromscratch.org">Anderson
-      Lizardo</ulink> <lizardo at linuxfromscratch.org> – Website
-      Backend-Scripts Maintainer</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:ryan at linuxfromscratch.org">Ryan
-      Oliver</ulink> <ryan at linuxfromscratch.org> – LFS Toolchain
-      Maintainer</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:jwrober at linuxfromscratch.org">James
-      Robertson</ulink> <jwrober at linuxfromscratch.org> – Bugzilla
-      Maintainer</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:tushar at linuxfromscratch.org">Tushar
-      Teredesai</ulink> <tushar at linuxfromscratch.org> – BLFS Book
-      Editor, Hints and Patches Project Leader</para>
-    </listitem>
-
-    <listitem>
-      <para>Countless other people on the various LFS and BLFS mailing lists
-      who helped make this book possible by giving their suggestions, testing
-      the book, and submitting bug reports, instructions, and their
-      experiences with installing various packages.</para>
-    </listitem>
-
-  </itemizedlist>
-
-  <bridgehead renderas="sect2">Translators</bridgehead>
-
-  <itemizedlist>
-
-    <listitem>
-      <para><ulink url="mailto:macana at lfs-es.com">Manuel Canales
-      Esparcia</ulink> <macana at lfs-es.com> – Spanish
-      LFS translation project</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:johan at linuxfromscratch.org">Johan
-      Lenglet</ulink> <johan at linuxfromscratch.org> – French LFS
-      translation project</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:lizardo at linuxfromscratch.org">Anderson
-      Lizardo</ulink> <lizardo at linuxfromscratch.org> –
-      Portuguese LFS translation project</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:tr at erdfunkstelle.de">Thomas
-      Reitelbach </ulink> <tr at erdfunkstelle.de> – German LFS
-      translation project</para>
-    </listitem>
-
-  </itemizedlist>
-
-  <bridgehead renderas="sect2">Mirror Maintainers</bridgehead>
-
-  <bridgehead renderas="sect3">North American Mirrors</bridgehead>
-
-  <itemizedlist>
-
-    <listitem>
-      <para><ulink url="mailto:scott at osuosl.org">Scott Kveton</ulink>
-      <scott at osuosl.org> – lfs.oregonstate.edu mirror</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:miha at xuy.biz">Mikhail Pastukhov</ulink>
-      <miha at xuy.biz> – lfs.130th.net mirror</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:lost at l-w.net">William Astle</ulink>
-      <lost at l-w.net> – ca.linuxfromscratch.org mirror</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:jpolen at rackspace.com">Jeremy Polen</ulink>
-      <jpolen at rackspace.com> – us2.linuxfromscratch.org mirror</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:tim at idge.net">Tim Jackson</ulink>
-      <tim at idge.net> – linuxfromscratch.idge.net mirror</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:jeremy at linux-phreak.net">Jeremy Utley</ulink>
-      <jeremy at linux-phreak.net> – lfs.linux-phreak.net mirror</para>
-    </listitem>
-
-  </itemizedlist>
-
-  <bridgehead renderas="sect3">South American Mirrors</bridgehead>
-
-  <itemizedlist>
-
-    <listitem>
-      <para><ulink url="mailto:sysop at mesi.com.ar">Andres Meggiotto</ulink>
-      <sysop at mesi.com.ar> – lfs.mesi.com.ar mirror</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:manuel at linuxfromscratch.org">Manuel
-      Canales Esparcia</ulink> <manuel at linuxfromscratch.org> –
-      lfsmirror.lfs-es.info mirror</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:ebf at aedsolucoes.com.br">Eduardo B.
-      Fonseca</ulink> <ebf at aedsolucoes.com.br> –
-      br.linuxfromscratch.org mirror</para>
-    </listitem>
-
-  </itemizedlist>
-
-  <bridgehead renderas="sect3">European Mirrors</bridgehead>
-
-  <itemizedlist>
-
-    <listitem>
-      <para><ulink url="mailto:barna at siker.hu">Barna Koczka</ulink>
-      <barna at siker.hu> – hu.linuxfromscratch.org mirror</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="http://www.mirror.ac.uk">UK Mirror Service</ulink>
-      – linuxfromscratch.mirror.ac.uk mirror</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:Martin.Voss at ada.de">Martin Voss</ulink>
-      <Martin.Voss at ada.de> – lfs.linux-matrix.net mirror</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:guido at primerelay.net">Guido Passet</ulink>
-      <guido at primerelay.net> – nl.linuxfromscratch.org mirror</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:baafie at planet.nl">Bastiaan Jacques</ulink>
-      <baafie at planet.nl> – lfs.pagefault.net mirror</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:lfs-mirror at linuxfromscratch.rave.org">Roel
-      Neefs</ulink> <lfs-mirror at linuxfromscratch.rave.org> –
-      linuxfromscratch.rave.org mirror</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:justin at jrknierim.de">Justin Knierim</ulink>
-      <justin at jrknierim.de> – www.lfs-matrix.de mirror</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:stevie at stevie20.de">Stephan Brendel</ulink>
-      <stevie at stevie20.de> – lfs.netservice-neuss.de mirror</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:Antonin.Sprinzl at tuwien.ac.at">Antonin
-      Sprinzl</ulink> <Antonin.Sprinzl at tuwien.ac.at> –
-      at.linuxfromscratch.org mirror</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:fredan-lfs at fredan.org">Fredrik
-      Danerklint</ulink> <fredan-lfs at fredan.org> –
-      se.linuxfromscratch.org mirror</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:archive at doc.cs.univ-paris8.fr">Parisian
-      sysadmins</ulink> <archive at doc.cs.univ-paris8.fr> –
-      www2.fr.linuxfromscratch.org mirror</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:velin at zadnik.org">Alexander Velin</ulink>
-      <velin at zadnik.org> – bg.linuxfromscratch.org mirror</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:dirk at securewebservices.co.uk"> Dirk
-      Webster</ulink> <dirk at securewebservices.co.uk> –
-      lfs.securewebservices.co.uk mirror</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:thomas at sofagang.dk">Thomas Skyt</ulink>
-      <thomas at sofagang.dk> – dk.linuxfromscratch.org mirror</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:sime at dot-sime.com">Simon Nicoll</ulink>
-      <sime at dot-sime.com> – uk.linuxfromscratch.org mirror</para>
-    </listitem>
-
-  </itemizedlist>
-
-  <bridgehead renderas="sect3">Asian Mirrors</bridgehead>
-
-  <itemizedlist>
-
-    <listitem>
-      <para><ulink url="mailto:pyng at spam.averse.net">Pui Yong</ulink>
-      <pyng at spam.averse.net> – sg.linuxfromscratch.org mirror</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:stuart at althalus.me.uk">Stuart
-      Harris</ulink> <stuart at althalus.me.uk> –
-      lfs.mirror.intermedia.com.sg mirror</para>
-    </listitem>
-
-  </itemizedlist>
-
-  <bridgehead renderas="sect3">Australian Mirrors</bridgehead>
-
-  <itemizedlist>
-
-    <listitem>
-      <para><ulink url="mailto:jason at dstc.edu.au">Jason Andrade</ulink>
-      <jason at dstc.edu.au> – au.linuxfromscratch.org mirror</para>
-    </listitem>
-
-  </itemizedlist>
-
-  <bridgehead renderas="sect2">Former Project Team Members</bridgehead>
-
-  <itemizedlist>
-
-    <listitem>
-      <para><ulink url="mailto:theladyskye at linuxfromscratch.org">Christine
-      Barczak</ulink> <theladyskye at linuxfromscratch.org> – LFS
-      Book Editor</para>
-    </listitem>
-
-    <listitem>
-      <para>Timothy Bauscher</para>
-    </listitem>
-
-    <listitem>
-      <para>Robert Briggs</para>
-    </listitem>
-
-    <listitem>
-      <para>Ian Chilton</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:jeroen at linuxfromscratch.org">Jeroen
-      Coumans</ulink> <jeroen at linuxfromscratch.org> – Website
-      Developer, FAQ Maintainer</para>
-    </listitem>
-
-    <listitem>
-      <para>Alex Groenewoud – LFS Technical Writer</para>
-    </listitem>
-
-    <listitem>
-      <para>Marc Heerdink</para>
-    </listitem>
-
-    <listitem>
-      <para>Mark Hymers</para>
-    </listitem>
-
-    <listitem><para>Seth W. Klein – FAQ maintainer</para></listitem>
-
-    <listitem>
-      <para><ulink url="mailto:nicholas at linuxfromscratch.org">Nicholas
-      Leippe</ulink> <nicholas at linuxfromscratch.org> – Wiki
-      Maintainer</para>
-    </listitem>
-
-    <listitem>
-      <para>Simon Perreault</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:scot at linuxfromscratch.org">Scot Mc
-      Pherson</ulink> <scot at linuxfromscratch.org> – LFS NNTP
-      Gateway Maintainer</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:semzx at newmail.ru">Alexander Patrakov</ulink>
-      <semzx at newmail.ru> – LFS Technical Writer</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:gschafer at zip.com.au">Greg Schafer</ulink>
-      <gschafer at zip.com.au> – LFS Technical Writer</para>
-    </listitem>
-
-    <listitem>
-      <para>Jesse Tie-Ten-Quee – LFS Technical Writer</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:jeremy at linuxfromscratch.org">Jeremy
-      Utley</ulink> <jeremy at linuxfromscratch.org> – LFS Technical
-      Writer, Bugzilla Maintainer, LFS-Bootscripts Maintainer</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:zwinkles at gmail.com">Zack Winkles</ulink>
-      <zwinkles at gmail.com> – LFS Technical Writer</para>
-    </listitem>
-
-  </itemizedlist>
-
-  <bridgehead renderas="sect2">A very special thank you to our
-  donators</bridgehead>
-
-  <itemizedlist>
-
-    <listitem>
-      <para><ulink url="mailto:dean at vipersoft.co.uk">Dean Benson</ulink>
-      <dean at vipersoft.co.uk> for several monetary contributions</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:hrx at hrxnet.de">Hagen Herrschaft</ulink>
-      <hrx at hrxnet.de> for donating a 2.2 GHz P4 system, now running
-      under the name of Lorien</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="http://www.vasoftware.com">VA Software</ulink> who,
-      on behalf of <ulink url="http://www.linux.com">Linux.com</ulink>,
-      donated a VA Linux 420 (former StartX SP2) workstation</para>
-    </listitem>
-
-    <listitem>
-      <para>Mark Stone for donating Belgarath, the linuxfromscratch.org
-      server</para>
-    </listitem>
-
-  </itemizedlist>
-
-</appendix>
diff --git a/BOOK/arm-index.xml b/BOOK/arm-index.xml
index 2cccee7..7b77a89 100644
--- a/BOOK/arm-index.xml
+++ b/BOOK/arm-index.xml
@@ -80,7 +80,6 @@
     <title>Appendices</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/acronymlist.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/acknowledgments.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/dependencies/common.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/dependencies/arm.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/license.xml"/>
diff --git a/BOOK/mips-index.xml b/BOOK/mips-index.xml
index 2b31d14..7329342 100644
--- a/BOOK/mips-index.xml
+++ b/BOOK/mips-index.xml
@@ -80,7 +80,6 @@
     <title>Appendices</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/acronymlist.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/acknowledgments.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/dependencies/common.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/dependencies/mips.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/license.xml"/>
diff --git a/BOOK/wrt-index.xml b/BOOK/wrt-index.xml
index 35b9651..168de6d 100644
--- a/BOOK/wrt-index.xml
+++ b/BOOK/wrt-index.xml
@@ -79,7 +79,6 @@
     <title>Appendices</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/acronymlist.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/acknowledgments.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/dependencies/common.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/dependencies/mips.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/license.xml"/>
diff --git a/BOOK/x86-index.xml b/BOOK/x86-index.xml
index 1bdb4e0..dd12b76 100644
--- a/BOOK/x86-index.xml
+++ b/BOOK/x86-index.xml
@@ -81,7 +81,6 @@
     <title>Appendices</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/acronymlist.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/acknowledgments.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/dependencies/common.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/dependencies/x86.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/license.xml"/>

commit 785054f2be0146b49fc698d2f173c013175aeb2e
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date:   Fri Jun 7 11:43:17 2013 -0400

    license: Fill in (C) and correct OPL contacts
    
    Copyright &year; and by each contributor.
    Fix email addresses so they match Open Pub license.

diff --git a/BOOK/appendices/license.xml b/BOOK/appendices/license.xml
index ef4cb79..3e603fc 100644
--- a/BOOK/appendices/license.xml
+++ b/BOOK/appendices/license.xml
@@ -25,9 +25,9 @@
   <para>Proper form for an incorporation by reference is as follows:</para>
 
   <blockquote>
-    <para>Copyright © <year> by <author's name or designee>.
+    <para>Copyright © &year; by each contributor.
     This material may be distributed only subject to the terms and conditions
-    set forth in the Open Publication License, vX.Y or later (the latest
+    set forth in the Open Publication License, v1.0 or later (the latest
     version is presently available at <ulink
     url="http://www.opencontent.org/openpub/"/>).</para>
   </blockquote>
@@ -170,8 +170,9 @@
   restrictive than the Open Publication license.</para>
 
   <para>If you have questions about the Open Publication License, please
-  contact David Wiley at dw at opencontent.org, and/or the Open Publication
-  Authors' List at opal at opencontent.org, via email.</para>
+  contact <ulink url="mailto:dw at opencontent.org">David Wiley</ulink>, and/or the
+  <ulink url="mailto:opal at opencontent.org">Open Publication Authors'
+   List</ulink>, via email.</para>
 
   <para>To <emphasis role="strong">subscribe</emphasis> to the Open Publication
   Authors' List: Send E-mail to opal-request at opencontent.org with the word

commit c4b6d181bc65ba5f726b5d4c3cb9d77f45f1a10e
Author: kanj <knjterrell at mybluelight.com>
Date:   Wed Feb 6 18:53:21 2013 -0800

    cleanup/remove-files: Remove ${CLFS}-final/sources

diff --git a/BOOK/cleanup/remove-files.xml b/BOOK/cleanup/remove-files.xml
index 5b6bf54..5c82ebe 100644
--- a/BOOK/cleanup/remove-files.xml
+++ b/BOOK/cleanup/remove-files.xml
@@ -26,7 +26,8 @@ rm -rfv ${CLFS}-final/usr/src/*
 rm -rfv ${CLFS}-final/usr/include
 rm -rfv ${CLFS}-final/usr/man
 rm -rfv ${CLFS}-final/usr/share/man
-rm -rfv ${CLFS}-final/build</userinput></screen>
+rm -rfv ${CLFS}-final/build
+rm -rfv ${CLFS}-final/sources</userinput></screen>
 
   <para>Remove the static libaries:</para>
 

-----------------------------------------------------------------------

Summary of changes:
 BOOK/Makefile                                  |    6 +-
 BOOK/appendices/acknowledgments.xml            |  421 ------------------------
 BOOK/appendices/license.xml                    |    9 +-
 BOOK/arm-index.xml                             |    3 -
 BOOK/beyond-net/common/iptables.xml            |    4 -
 BOOK/beyond-net/common/libnl.xml               |    4 -
 BOOK/beyond-net/common/patches.xml             |   22 +-
 BOOK/cleanup/remove-files.xml                  |    3 +-
 BOOK/cross-tools/arm/gcc-static.xml            |   11 -
 BOOK/general.ent                               |    8 +-
 BOOK/introduction/common/changelog.xml         |   19 +
 BOOK/materials/arm/patches.xml                 |   16 +-
 BOOK/mips-index.xml                            |    3 -
 BOOK/packages.ent                              |  111 +++----
 BOOK/patches.ent                               |   12 -
 BOOK/prologue/common/hostreqs.xml              |   40 +--
 BOOK/system-build/arm-chapter.xml              |   16 -
 BOOK/system-build/mips-chapter.xml             |   16 -
 BOOK/system-build/x86-chapter.xml              |   16 -
 BOOK/system-prep/arm-chapter.xml               |   16 -
 BOOK/system-prep/mips-chapter.xml              |   16 -
 BOOK/system-prep/x86-chapter.xml               |   16 -
 BOOK/the-end/chapter.xml                       |    1 -
 BOOK/the-end/getcounted.xml                    |   20 --
 BOOK/wrt-index.xml                             |    1 -
 BOOK/x86-index.xml                             |    3 -
 patches/busybox-1.17.3-fixes-1.patch           |   92 -----
 patches/gcc-4.6.0-uclibc-arm-softfloat-2.patch |   51 ---
 patches/iptables-1.4.2-fixes-1.patch           |  133 --------
 patches/libnl-git-fixes-1.patch                |  110 ------
 30 files changed, 111 insertions(+), 1088 deletions(-)
 delete mode 100644 BOOK/appendices/acknowledgments.xml
 delete mode 100644 BOOK/system-build/arm-chapter.xml
 delete mode 100644 BOOK/system-build/mips-chapter.xml
 delete mode 100644 BOOK/system-build/x86-chapter.xml
 delete mode 100644 BOOK/system-prep/arm-chapter.xml
 delete mode 100644 BOOK/system-prep/mips-chapter.xml
 delete mode 100644 BOOK/system-prep/x86-chapter.xml
 delete mode 100644 BOOK/the-end/getcounted.xml
 delete mode 100644 patches/busybox-1.17.3-fixes-1.patch
 delete mode 100644 patches/gcc-4.6.0-uclibc-arm-softfloat-2.patch
 delete mode 100644 patches/iptables-1.4.2-fixes-1.patch
 delete mode 100644 patches/libnl-git-fixes-1.patch


hooks/post-receive
-- 
Cross-LFS Embedded Book



More information about the Clfs-commits mailing list