From ec1aff0d1ba15c272b63662766fdc29970db642d Mon Sep 17 00:00:00 2001
From: Hugo Villeneuve <hugo@hugovil.com>
Date: Mon, 17 Jun 2013 22:29:53 -0400
Subject: [PATCH] Fix various compilation errors

---
 stage2/hv-install-1 | 2 +-
 stage2/hv-install-2 | 2 +-
 stage2/pkg/kmod     | 2 +-
 stage2/pkg/ncurses  | 3 ++-
 stage3/hv-install-1 | 2 +-
 stage3/pkg/git      | 5 ++---
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/stage2/hv-install-1 b/stage2/hv-install-1
index 65f9a7d..dfe808c 100755
--- a/stage2/hv-install-1
+++ b/stage2/hv-install-1
@@ -45,7 +45,7 @@ ipkg ${PKG_CONFIG}
 ipkg ${NCURSES}
 ipkg ${UTIL_LINUX}
 ipkg ${E2FSPROGS}
-FORCE_UNSAFE_CONFIGURE=1 ipkg ${COREUTILS}
+FORCE_UNSAFE_CONFIGURE=1 ipkg  -m acnb ${COREUTILS}
 ipkg -m noac ${IANA}
 ipkg ${MFOUR}
 ipkg ${BISON}
diff --git a/stage2/hv-install-2 b/stage2/hv-install-2
index 7a29ca4..1a820b8 100755
--- a/stage2/hv-install-2
+++ b/stage2/hv-install-2
@@ -41,7 +41,7 @@ ipkg -m noac ${SYSVINIT}
 FORCE_UNSAFE_CONFIGURE=1 ipkg ${TAR_PACKAGE} "--bindir=/bin --libexecdir=/usr/sbin"
 ipkg ${TEXINFO}
 ipkg ${UDEV}
-ipkg ${GRUB}
+ipkg ${GRUB} --disable-werror
 ipkg -m acnb ${DHCP}
 
 if [ -n "${WIFI_SUPPORT}" ]; then
diff --git a/stage2/pkg/kmod b/stage2/pkg/kmod
index a119581..96b3b36 100644
--- a/stage2/pkg/kmod
+++ b/stage2/pkg/kmod
@@ -8,13 +8,13 @@ hvconfig_pre()
         --bindir=/bin \
         --sysconfdir=/etc \
         --with-rootlibdir=/lib \
+        --disable-manpages  \
         --with-zlib \
         --with-xz"
 }
 
 hvbuild_post()
 {
-    # Est-ce encore nécessaire avec kmod?
     install -dv ${LFS}/etc/modprobe.d
 
     # Create symbolic links for programs that expect Module-Init-Tools:
diff --git a/stage2/pkg/ncurses b/stage2/pkg/ncurses
index 739a4a2..77435e6 100644
--- a/stage2/pkg/ncurses
+++ b/stage2/pkg/ncurses
@@ -8,6 +8,7 @@ hvconfig_pre()
         --with-shared \
         --without-debug \
         --enable-widec \
+        --with-default-terminfo-dir=/usr/share/terminfo  \
         --with-manpage-format=normal"
 }
 
@@ -22,7 +23,7 @@ hvbuild_post()
     ln -svfT ../../lib/libmenuw.so.5 /usr/lib/libmenuw.so
     ln -svfT ../../lib/libpanelw.so.5 /usr/lib/libpanelw.so
     ln -svfT ../../lib/libformw.so.5 /usr/lib/libformw.so
-    
+
     # Make our Ncurses compatible for older and non-widec compatible programs can build properly.
     # Many applications still expect the linker to be able to find
     # non-wide-character Ncurses libraries. Trick such applications
diff --git a/stage3/hv-install-1 b/stage3/hv-install-1
index c7a2f61..27a3589 100755
--- a/stage3/hv-install-1
+++ b/stage3/hv-install-1
@@ -44,7 +44,7 @@ ipkg ${PCRE} "--docdir=/usr/share/doc/pcre \
 # Networking
 ipkg -m noac -s tcp_wrappers ${TCPWRAPPERS}
 ipkg -m acnb ${RPCBIND} "--bindir=/sbin"
-LIBS="-lpthread" ipkg -m acnb ${NFS_UTILS} "\
+LIBS="-lpthread" ipkg -m acnb ${NFS_UTILS} " \
     --disable-nfsv4 \
     --disable-nfsv41 \
     --sbindir=/sbin \
diff --git a/stage3/pkg/git b/stage3/pkg/git
index d1114b0..be91cff 100644
--- a/stage3/pkg/git
+++ b/stage3/pkg/git
@@ -2,12 +2,11 @@
 
 hvbuild_post()
 {
-    install -v -m644 ${SCRDIR}/misc/git-completion.bash \
-        /etc/bash_completion.d
-
     local GIT_MANPAGES="git-manpages-$(get_pkg_ver ${PACKAGE})"
 
     decompress_package ${GIT_MANPAGES} /usr/share/man
 
+    install -v -m644 ${SCRDIR}/misc/git/git-completion.bash \
+        /etc/bash_completion.d
     install -v -m644 ${SCRDIR}/misc/git/gitconfig /etc
 }
-- 
2.20.1