diff --git a/bootscripts/README b/bootscripts/README
index 72e1eb5f3..b71b10a64 100644
--- a/bootscripts/README
+++ b/bootscripts/README
@@ -45,28 +45,30 @@ CleanFS configuration:
/etc/rc.d/init.d/cleanfs
Configuration Files:
- /etc/sysconfig/createfiles or /etc/sysconfig/rc.site
- Each line is parsed, using space as a deliminator.
- [NAME] [TYPE] [PERMISSIONS] [USER] [GROUP]
- The below fields are currently only used on dev type.
- ([DEV TYPE] [MAJOR#] [MINOR#])
- Name:
- File/Directory/Device name
- Type:
- dir: creates a directory
- file: creates a file
- dev: creates a device
- Permissions:
- chmod the created file
- User/Group:
- chown the created file/dir to this user/group
- Dev Type:
- char: character [needs MAJOR#, MINOR#]
- block: block [needs MAJOR#, MINOR#]
- pipe: pipe
- Major#:
- Used by character and block devices.
- Minor#:
- Used by character and block devices.
+ /etc/sysconfig/rc.site
- SKIPTMPCLEAN: skips cleaning of /tmp directory
+ /etc/sysconfig/createfiles
+ Each line is parsed, using space as a deliminator.
+ [NAME] [TYPE] [PERMISSIONS] [USER] [GROUP]
+ The below fields are currently only used on dev type.
+ ([DEV TYPE] [MAJOR#] [MINOR#])
+ Name:
+ File/Directory/Device name
+ Type:
+ dir: creates a directory
+ file: creates a file
+ dev: creates a device
+ Permissions:
+ chmod the created file
+ User/Group:
+ chown the created file/dir to this user/group
+ Dev Type:
+ char: character [needs MAJOR#, MINOR#]
+ block: block [needs MAJOR#, MINOR#]
+ pipe: pipe
+ Major#:
+ Used by character and block devices.
+ Minor#:
+ Used by character and block devices.
+
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 15f7b2396..c5802b020 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -35,6 +35,20 @@
-->
+
+ 2014-08-15
+
+
+ [bdubbs] - Remove redundant wording in checking
+ toolchain values. Fixes
+ #3654.
+
+
+ [bdubbs] - Reword bootscripts README file.
+
+
+
+
2014-08-14
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/general.ent b/general.ent
index 7e8983fa1..6a442a8a0 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
-
+
-
+
diff --git a/packages.ent b/packages.ent
index 0c8d697f3..f36d0c6c1 100644
--- a/packages.ent
+++ b/packages.ent
@@ -370,7 +370,7 @@
-
+