diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index f20e03cb4..d834b805b 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -35,11 +35,22 @@
-->
+
+ 2014-08-16
+
+
+ [krejzi] - Merged LFS SVN-20140815.
+
+
+
+
2014-08-15
- [krejzi] - Merged LFS SVN-20140814.
+ [bdubbs] - Remove redundant wording in checking
+ toolchain values. Fixes
+ #3654.
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index d0bc248de..cdb9ffce9 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -596,15 +596,6 @@
-
- Time Zone Data (&tzdata-version;) - &tzdata-size;:
-
- Home page:
- Download:
- MD5 sum: &tzdata-md5;
-
-
-
Texinfo (&texinfo-version;) - &texinfo-size;:
@@ -614,6 +605,15 @@
+
+ Time Zone Data (&tzdata-version;) - &tzdata-size;:
+
+ Home page:
+ Download:
+ MD5 sum: &tzdata-md5;
+
+
+
Util-linux (&util-linux-version;) - &util-linux-size;:
diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index 49612eba7..f035784c9 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -196,12 +196,12 @@ cd ../gcc-build
--disable-decimal-float, --disable-threads,
--disable-libatomic, --disable-libgomp, --disable-libitm,
- --disable-libmudflap, --disable-libquadmath, --disable-libsanitizer,
+ --disable-libquadmath, --disable-libsanitizer,
--disable-libssp, --disable-libvtv, --disable-libcilkrts,
--disable-libstdc++-v3
These switches disable support for the decimal floating point
- extension, threading, libatomic, libgomp, libitm, libmudflap,
+ extension, threading, libatomic, libgomp, libitm,
libquadmath, libsanitizer, libssp, libvtv, libcilkrts
and the C++ standard library respectively. These features will fail
to compile when building a cross-compiler and are not necessary for
diff --git a/chapter06/adjusting.xml b/chapter06/adjusting.xml
index 933bebb44..f6b00971d 100644
--- a/chapter06/adjusting.xml
+++ b/chapter06/adjusting.xml
@@ -46,7 +46,7 @@ ln -sv /tools/bin/ld /tools/$(gcc -dumpmachine)/bin/ld
cc dummy.c -v -Wl,--verbose &> dummy.log
readelf -l a.out | grep ': /lib'
- If everything is working correctly, there should be no errors,
+ There should be no errors,
and the output of the last command will be (allowing for
platform-specific differences in dynamic linker name):
@@ -59,8 +59,7 @@ readelf -l a.out | grep ': /lib'
grep -o '/usr/lib.*/crt[1in].*succeeded' dummy.log
- If everything is working correctly, there should be no errors,
- and the output of the last command will be:
+ The output of the last command should be:
/usr/lib/crt1.o succeeded
/usr/lib/crti.o succeeded
@@ -71,7 +70,7 @@ readelf -l a.out | grep ': /lib'
grep -B1 '^ /usr/include' dummy.log
- This command should return successfully with the following output:
+ This command should return the following output:
#include <...> search starts here:
/usr/include
@@ -80,9 +79,7 @@ readelf -l a.out | grep ': /lib'
grep 'SEARCH.*/usr/lib' dummy.log |sed 's|; |\n|g'
- If everything is working correctly, there should be no errors,
- and the output of the last command
- will be:
+ The output of the last command should be:
SEARCH_DIR("/usr/lib")
SEARCH_DIR("/lib");
@@ -91,9 +88,8 @@ SEARCH_DIR("/lib");
grep "/lib.*/libc.so.6 " dummy.log
- If everything is working correctly, there should be no errors,
- and the output of the last command (allowing for a lib64 directory on 64-bit hosts)
- will be:
+ The output of the last command (allowing for a lib64 directory
+ on 64-bit hosts) should be:
attempt to open /lib/libc.so.6 succeeded
@@ -101,10 +97,9 @@ SEARCH_DIR("/lib");
grep found dummy.log
- If everything is working correctly, there should be no errors,
- and the output of the last command will be (allowing for
- platform-specific differences in dynamic linker name and a lib64 directory
- on 64-bit hosts):
+ The output of the last command should be (allowing for
+ platform-specific differences in dynamic linker name and a lib64 directory on
+ 64-bit hosts):
found ld-linux.so.2 at /lib/ld-linux.so.2
diff --git a/chapter07/clock.xml b/chapter07/clock.xml
index 583b1a088..455b75a8f 100644
--- a/chapter07/clock.xml
+++ b/chapter07/clock.xml
@@ -57,7 +57,7 @@ EOF
To change your current system time, issue:
-timedatectl set-time YYYY:MM:DD HH:MM:SS
+timedatectl set-time YYYY-MM-DD HH:MM:SS
Hardware clock will also be updated accordingly.
diff --git a/general.ent b/general.ent
index 9b4db837e..f327abb4f 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
-
+
-
+