diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index bb4fbcb6e..b59defd6d 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -35,6 +35,23 @@
-->
+
+ 2014-07-27
+
+
+ [bdubbs] - Update to tar-1.28. Fixes
+ #3642.
+
+
+ [bdubbs] - Instruct perl to use the system bzip2 library.
+
+
+ [bdubbs] - Update to check-0.9.14. Fixes
+ #3641.
+
+
+
+
2014-07-26
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index f4fc87d26..a184c73c7 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -196,9 +196,9 @@
Systemd &systemd-version;
-
+
@@ -278,6 +278,10 @@
readline-6.2-fixes-2.patch
+
+ tar-1.27.1-manpage-1.patch
+
+
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 712f1b218..243e4bc63 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -131,7 +131,7 @@
MD5 sum: &systemd-compat-patch-md5;
-
+
Total size of these patches: about
diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml
index 7212860f1..b1fed57f9 100644
--- a/chapter06/e2fsprogs.xml
+++ b/chapter06/e2fsprogs.xml
@@ -44,11 +44,6 @@
Installation of E2fsprogs
- First fix a problem with running regression tests in the LFS chroot
- environment:
-
-sed -i -e 's|^LD_LIBRARY_PATH.*|&:/tools/lib|' tests/test_config
-
The E2fsprogs documentation recommends that the package be built in
a subdirectory of the source tree:
@@ -121,13 +116,12 @@ PKG_CONFIG_PATH=/tools/lib/pkgconfig \
make
- To set up the test suite we need to temporarily copy
- a library from /tools/lib so the test programs can find it.
+ To set up and run the test suite we need to first link some
+ libraries from /tools/lib to a location where the test programs look.
To run the tests, issue:
-cp -v /tools/lib/libblkid.so.1 /lib
-make check
-rm -v /lib/libblkid.so.1
+ln -sfv /tools/lib/lib{blk,uu}id.so.1 lib
+make LD_LIBRARY_PATH=/tools/lib check
One of the E2fsprogs tests will attempt to allocate 256 MB of memory.
If you do not have significantly more RAM than this, be sure to enable
diff --git a/chapter06/perl.xml b/chapter06/perl.xml
index 645016932..170aa2388 100644
--- a/chapter06/perl.xml
+++ b/chapter06/perl.xml
@@ -47,15 +47,14 @@
echo "127.0.0.1 localhost $(hostname)" > /etc/hosts
- This version of Perl now builds the Compress::Raw::Zlib module. By
- default Perl will use an internal copy of the Zlib source for the build.
- Issue the following command so that Perl will use the Zlib library
+ This version of Perl now builds the Compress::Raw::Zlib ane
+ Compress::Raw::BZip2 modules. By
+ default Perl will use an internal copy of the sources for the build.
+ Issue the following command so that Perl will use the libraries
installed on the system:
-sed -i -e "s|BUILD_ZLIB\s*= True|BUILD_ZLIB = False|" \
- -e "s|INCLUDE\s*= ./zlib-src|INCLUDE = /usr/include|" \
- -e "s|LIB\s*= ./zlib-src|LIB = /usr/lib|" \
- cpan/Compress-Raw-Zlib/config.in
+export BUILD_ZLIB=False
+export BUILD_BZIP2=0
To have full control over the way Perl is set up, you can remove the
-des
options from the following command and hand-pick the way
@@ -115,9 +114,10 @@
make -k test
- Install the package:
+ Install the package and clean up:
-make install
+make install
+unset BUILD_ZLIB BUILD_BZIP2
diff --git a/chapter06/tar.xml b/chapter06/tar.xml
index c3c3c0738..ee69bad86 100644
--- a/chapter06/tar.xml
+++ b/chapter06/tar.xml
@@ -39,11 +39,11 @@
Installation of Tar
-
+
Prepare Tar for compilation:
FORCE_UNSAFE_CONFIGURE=1 \
@@ -76,11 +76,11 @@
make install
make -C doc install-html docdir=/usr/share/doc/tar-&tar-version;
-
+
diff --git a/packages.ent b/packages.ent
index 4c78743e2..a4a119159 100644
--- a/packages.ent
+++ b/packages.ent
@@ -92,10 +92,10 @@
-
-
+
+
-
+
@@ -550,10 +550,10 @@
-
-
+
+
-
+
diff --git a/patches.ent b/patches.ent
index a10c3001e..21ccaf01e 100644
--- a/patches.ent
+++ b/patches.ent
@@ -63,6 +63,9 @@
+
+