X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage2%2Fhv-install-2;h=d9ed780560e325ffd1f2d45a0819b1f6f0cd654f;hb=781acd83f772630262c2a8ba22c8fe7507801852;hp=12de7aa53df1854cd2abbcc0784c5921145a992c;hpb=a348576b5f215c87cf471d4340713e0773f4edf8;p=hvlinux.git

diff --git a/stage2/hv-install-2 b/stage2/hv-install-2
index 12de7aa..d9ed780 100755
--- a/stage2/hv-install-2
+++ b/stage2/hv-install-2
@@ -18,6 +18,13 @@ ipkg ${GZIP}
 ipkg ${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 \
@@ -30,16 +37,25 @@ ipkg ${PSMISC}
 ipkg ${SHADOW}
 ipkg -m noac ${SYSKLOGD}
 ipkg -m noac ${SYSVINIT}
-ipkg ${TAR_PACKAGE} "--bindir=/bin --libexecdir=/usr/sbin"
+FORCE_UNSAFE_CONFIGURE=1 ipkg ${TAR_PACKAGE} "--bindir=/bin --libexecdir=/usr/sbin"
 ipkg ${TEXINFO}
 ipkg ${UDEV}
-ipkg -m noac ${UDEV_CONFIG}
 ipkg ${GRUB}
-ipkg -m acnb ${DHCP}
-PREFIX=/usr ipkg -m noac -s wireless-tools ${WIRELESS_TOOLS}
-ipkg -m noac ${WPA_SUPPLICANT}
-PREFIX=/usr ipkg -m noac ${B43_FWCUTTER}
+ipkg -m acnb ${DHCP} "--exec-prefix=/"
+
+if [ -n "${WIFI_SUPPORT}" ]; then
+    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 -m noac ${ACPID}
+ipkg -c -m noac -l "kernel" -s "kernel" ${KERNEL}
 
 rscr once "Installing HV-utilities" install-hv-utilities
 rscr once "Installing bootscripts"  install-bootscripts
@@ -48,16 +64,13 @@ 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 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