diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 97ce8ee66..47f4b98f7 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -39,6 +39,10 @@ 2012-11-13 + + [matthew] - Upgrade to Kmod-11. Fixes + #3223. + [matthew] - Upgrade to Man-Pages-3.44. Fixes #3222. diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 0894ab8f1..a3ceaa244 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -244,10 +244,6 @@ &iproute2-ipset-patch; - - &kmod-test_fix-patch; - - &make-fixes-patch; diff --git a/chapter03/patches.xml b/chapter03/patches.xml index e960a65c2..8df0518b1 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -98,14 +98,6 @@ - - Kmod Testsuite Fix Patch - &kmod-test_fix-patch-size;: - - Download: - MD5 sum: &kmod-test_fix-patch-md5; - - - Make Upstream Fixes Patch - &make-fixes-patch-size;: diff --git a/chapter06/kmod.xml b/chapter06/kmod.xml index 18589a55a..5a4daf768 100644 --- a/chapter06/kmod.xml +++ b/chapter06/kmod.xml @@ -41,16 +41,13 @@ Installation of Kmod - Apply a patch to fix a testsuite issue on 32-bit machines: - -patch -Np1 -i ../&kmod-test_fix-patch; - Prepare Kmod for compilation: ./configure --prefix=/usr \ --bindir=/bin \ --libdir=/lib \ --sysconfdir=/etc \ + --disable-manpages \ --with-xz \ --with-zlib @@ -64,6 +61,13 @@ The shell variables are required in order for the xz and zlib headers and libraries to be found in the absence of pkg-config. + + --disable-manpages + + This option prevents the man pages from being built, as they + rely on libxslt, which isn't available in the chroot + environment. + diff --git a/packages.ent b/packages.ent index ddd4034aa..68d8898db 100644 --- a/packages.ent +++ b/packages.ent @@ -286,10 +286,10 @@ - - + + - + diff --git a/patches.ent b/patches.ent index fcf85f4d9..da89ff1bd 100644 --- a/patches.ent +++ b/patches.ent @@ -67,11 +67,6 @@ - - - - -