Fix various compilation errors

diff --git a/stage2/hv-install-1 b/stage2/hv-install-1
index 65f9a7d3aaec98692abe1c46bf77ad5bd356a7dd..dfe808c122c51f7d0cf2ebe8bf10e83dccb646fd 100755 (executable)
--- 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 7a29ca41e6e93f186434202bd8c39427b1938491..1a820b8af99097160cc3bca9946a055b4f2793fb 100755 (executable)
--- 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 a119581954972547b7bf47b73e67fec5ba6609bf..96b3b365d9f8b1041d22097f122c1e19d9fccf3f 100644 (file)
--- 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 739a4a21d2f24146063821c42f8900e4fc433156..77435e62b6aadd8fc13e7242f4f50cceae6d70f2 100644 (file)
--- 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 c7a2f61f96143f6f0834eb4c126a408ac2c8ac56..27a358957395390e39b26dc4dc87464ca1df5cc6 100755 (executable)
--- 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 d1114b06a438a82f4a8a423c7d28631aae17a93b..be91cffc3e2160457a488fdf95b8a090f9a6c49f 100644 (file)
--- 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
 }