Upgrade to gdbm-1.11

[hvlinux.git] / stage2 / hv-install-2

diff --git a/stage2/hv-install-2 b/stage2/hv-install-2
index e0a0bd2..531d57e 100755 (executable)
--- a/stage2/hv-install-2
+++ b/stage2/hv-install-2
@@ -5,18 +5,28 @@ source ../functions/main
 init_log_file
 
 ipkg ${BC} "--with-readline"
-ipkg ${GDBM}
-ipkg ${INETUTILS}
+ipkg ${GDBM} "--enable-libgdbm-compat"
+ipkg ${INETUTILS} "\
+    --libexecdir=/usr/sbin \
+    --localstatedir=/var \
+    --disable-ifconfig \
+    --disable-logger \
+    --disable-syslogd \
+    --disable-whois \
+    --disable-servers"
 ipkg -m noac ${BZIP2}
 ipkg ${DIFFUTILS}
 ipkg ${FILE_PKG}
 ipkg ${GAWK} "--libexecdir=/usr/lib"
-ipkg ${FINDUTILS}
+ipkg ${FINDUTILS} "\
+    --libexecdir=/usr/lib/findutils \
+    --localstatedir=/var/lib/locate"
 ipkg ${GETTEXT}
+ipkg ${GPERF}
 ipkg ${GREP} "--bindir=/bin --without-included-regex"
 ipkg ${GROFF}
-ipkg ${GZIP}
-ipkg ${KBD}
+ipkg ${GZIP} "--bindir=/bin"
+ipkg ${KBD} "--datadir=/lib/kbd"
 ipkg ${LESS}
 ipkg ${MAKE_PACKAGE}
 ipkg ${XZ_UTILS}
@@ -37,12 +47,13 @@ ipkg ${PATCH_PACKAGE}
 ipkg ${PSMISC}
 ipkg ${SHADOW}
 ipkg -m noac ${SYSKLOGD}
-ipkg -m noac ${SYSVINIT}
+ipkg -m noac -d src ${SYSVINIT}
 FORCE_UNSAFE_CONFIGURE=1 ipkg ${TAR_PACKAGE} "--bindir=/bin --libexecdir=/usr/sbin"
 ipkg ${TEXINFO}
 ipkg ${EUDEV}
-ipkg ${GRUB} --disable-werror
+CFLAGS="" CPPFLAGS="" CXXFLAGS="" ipkg ${GRUB} --disable-werror
 ipkg -m acnb ${DHCP}
+ipkg -m acnb ${DHCPCD}
 
 if [ -n "${WIFI_SUPPORT}" ]; then
     ipkg -m acnb ${LIBNL} "--disable-static"
@@ -56,13 +67,13 @@ if [ -n "${WIFI_SUPPORT}" ]; then
 fi
 
 ipkg ${NANO}
-ipkg -m noac ${ACPID}
+ipkg ${ACPID}
 ipkg ${HV_UTILITIES} "--prefix=/usr/local"
 
 ipkg ${LZO} "--enable-shared --disable-static"
 ipkg ${LZOP}
 
-ipkg -c -m noac -l "kernel" -s "kernel" ${KERNEL}
+ipkg -m noac -l "kernel" -s "kernel" ${KERNEL}
 
 rscr once "Installing bootscripts"  install-bootscripts
 rscr once "Creating default config files" create-config-files
@@ -70,8 +81,7 @@ rscr once "Creating default config files" create-config-files
 rscr mult  "Compressing man pages"   compressdoc
 #rscr mult "Stripping" stripping
 
-echo "Setting root password:"
-rscr once "" create-root-password
+rscr once "Setting root password:\n" create-root-password
 
 rscr mult  "Performing post-install" post-install
 ldconfig