Upgraded coreutils and fixed man regeneration bug

diff --git a/config/packages-list b/config/packages-list
index 550f384..9029cd3 100644 (file)
--- a/config/packages-list
+++ b/config/packages-list
@@ -45,7 +45,7 @@ CLAMAV="clamav-0.97.5"
 CLOOG="cloog-0.16.3"
 CMAKE="cmake-2.8.10"
 COLORDIFF="colordiff-1.0.10"
-COREUTILS="coreutils-8.16"
+COREUTILS="coreutils-8.21"
 CPIO="cpio-2.11"
 CUPS="cups-1.4.8"
 CUPS_PDF="cups-pdf-2.5.1"

diff --git a/stage1/hv-install-2 b/stage1/hv-install-2
index 5c04a99..dace5fb 100755 (executable)
--- a/stage1/hv-install-2
+++ b/stage1/hv-install-2
@@ -33,7 +33,7 @@ ipkg ${NCURSES} "\
 ipkg ${BASH} "--without-bash-malloc"
 ipkg ${BISON}
 ipkg -m noac ${BZIP2}
-ipkg ${COREUTILS} "--enable-install-program=hostname"
+ipkg -m acnb -j ${COREUTILS} "--enable-install-program=hostname"
 ipkg ${DIFFUTILS}
 ipkg ${FINDUTILS}
 ipkg ${FILE_PKG}

diff --git a/stage1/pkg/coreutils b/stage1/pkg/coreutils
index c5ce637..d8de2a7 100644 (file)
--- a/stage1/pkg/coreutils
+++ b/stage1/pkg/coreutils
@@ -1,15 +1,14 @@
 #!/bin/bash
 
-hvconfig_pre()
+hvconfig_post()
 {
-    # Fix a bug when the uname patch is automatically applied
-    touch ${LFS_TMP}/${PACKAGE}/man/hostname.1
+    cd ${LFS_TMP}/${PACKAGE}
+    sed -e 's/^#\(run_help2man.*dummy-man\)/\1/' \
+        -e 's/^\(run_help2man.*PERL.*\)/#\1/' \
+        -i Makefile
 
-    # Patches may modify many .c files, so the make process will try to
-    # re-build the manpages by running help2man, and this causes problems
-    # when cross-compiling. So let's just update the timestamps and skip the
-    # help2man step.
-    find ${LFS_TMP}/${PACKAGE} -name \*.1 -exec touch {} \;
+    # Prevent autoreconf from discarding our modification to Makefile:
+    touch Makefile{,.in,.am}
 }
 
 # Configure cannot properly determine how to get free space when cross-compiling