X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage2%2Fhv-install-2;h=531d57e06bc6bcfa9b9ab35543e15d9c0986bfe6;hb=cf3d9a3b194a6578c881cdd4eb528398d4de2741;hp=bb0079c24726eb0db22f7c1519316534c0f290d4;hpb=f920c7ef750f2163b9e407cc453b192ede2c185a;p=hvlinux.git

diff --git a/stage2/hv-install-2 b/stage2/hv-install-2
index bb0079c..531d57e 100755
--- a/stage2/hv-install-2
+++ b/stage2/hv-install-2
@@ -1,63 +1,92 @@
 #!/bin/bash
 
-# Reading system configuration informations, functions and package versions.
-source ../config/sysinfos
-source ../functions
-source ../config/packages-list
+source ../functions/main
 
 init_log_file
 
-ipkg ${GDBM}
-ipkg ${INETUTILS}
+ipkg ${BC} "--with-readline"
+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}
+ipkg ${LIBPIPELINE} "\
+    --libexecdir=/usr/lib \
+    --disable-setuid \
+    --with-browser=/usr/bin/lynx \
+    --with-vgrind=/usr/bin/vgrind \
+    --with-grap=/usr/bin/grap"
 ipkg ${MAN_DB} "\
     --libexecdir=/usr/lib \
     --disable-setuid \
     --with-browser=/usr/bin/lynx \
     --with-vgrind=/usr/bin/vgrind \
     --with-grap=/usr/bin/grap"
-ipkg ${MODULE_INIT_TOOLS}
+ipkg ${KMOD}
 ipkg ${PATCH_PACKAGE}
 ipkg ${PSMISC}
 ipkg ${SHADOW}
 ipkg -m noac ${SYSKLOGD}
-ipkg -m noac ${SYSVINIT}
-ipkg ${TAR_PACKAGE} "--bindir=/bin --libexecdir=/usr/sbin"
+ipkg -m noac -d src ${SYSVINIT}
+FORCE_UNSAFE_CONFIGURE=1 ipkg ${TAR_PACKAGE} "--bindir=/bin --libexecdir=/usr/sbin"
 ipkg ${TEXINFO}
-ipkg ${UDEV}
-ipkg -m noac ${UDEV_CONFIG}
-ipkg ${GRUB}
+ipkg ${EUDEV}
+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"
+    PREFIX=/usr ipkg -m noac -s wireless-tools ${WIRELESS_TOOLS}
+    ipkg -m noac ${WPA_SUPPLICANT}
+
+    if [ -n "${B43_LPPHY}" ]; then
+        PREFIX=/usr ipkg -m noac ${B43_FWCUTTER}
+        ipkg -m noac -s firmware-b43-lpphy ${FIRMWARE_B43_LPPHY}
+    fi
+fi
+
 ipkg ${NANO}
+ipkg ${ACPID}
+ipkg ${HV_UTILITIES} "--prefix=/usr/local"
+
+ipkg ${LZO} "--enable-shared --disable-static"
+ipkg ${LZOP}
+
+ipkg -m noac -l "kernel" -s "kernel" ${KERNEL}
 
-rscr once "Installing HV-utilities" install-hv-utilities
 rscr once "Installing bootscripts"  install-bootscripts
 rscr once "Creating default config files" create-config-files
 
 rscr mult  "Compressing man pages"   compressdoc
 #rscr mult "Stripping" stripping
 
-echo "Total build time: $(get_total_build_time ${LFS_LOG_FILE})h"
-
-# Creating root password
-passwd root
+rscr once "Setting root password:\n" create-root-password
 
 rscr mult  "Performing post-install" post-install
 ldconfig
 
-echo "Stage2 successfully completed."
-echo "You must now compile a new kernel (go to /usr/src/linux)."
-echo "After that, you can reboot and try your new system."
+write_completed_stage
+display_stage_build_stats
 
 exec /bin/bash --login