X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage2%2Fhv-install-1;h=65f9a7d3aaec98692abe1c46bf77ad5bd356a7dd;hb=496fe638ddb82977bb02578cc9e1c39ffcc8c41e;hp=fe49fbd72a85d253b770aeed4dc1a73cff104c24;hpb=f3c8db3027d5dc530e1f30c88e0235975211582e;p=hvlinux.git

diff --git a/stage2/hv-install-1 b/stage2/hv-install-1
index fe49fbd..65f9a7d 100755
--- a/stage2/hv-install-1
+++ b/stage2/hv-install-1
@@ -3,19 +3,16 @@
 source ../functions/main
 source /etc/profile
 
-if [ "x${USER}" != "xroot" ]; then
-    echo "You must be the superuser to install hvlinux."
-    exit 1
-fi
-
+check_for_root_user
 init_log_file
 
 rscr mult "Performing pre-install" pre-install
 
-ipkg -l "${PERL}-pass1" ${PERL}
-ipkg -m noac ${KERNEL}
+ipkg -j -l "${PERL}-pass1" ${PERL}
+ipkg -c -m noac -l "kernel-headers" -s "kernel-headers" ${KERNEL}
 ipkg -m noac ${MANPAGES}
 ipkg ${EGLIBC}
+
 rscr once "Adjusting toolchain" toolchain-adjust
 rscr mult "Testing toolchain"   toolchain-test
 
@@ -29,7 +26,7 @@ ipkg ${MPFR} "--enable-shared --with-gmp=/usr"
 ipkg ${MPC}
 CPPFLAGS=-fexceptions \
     ipkg ${PPL} "--enable-shared --disable-optimization"
-ipkg ${CLOOG_PPL} "--enable-shared --with-gmp --with-ppl"
+ipkg ${CLOOG} "--enable-shared"
 
 unset CC
 unset CXX
@@ -40,11 +37,15 @@ ipkg ${BINUTILS}
 ipkg ${GCC}
 rscr mult "Testing toolchain" toolchain-test
 ipkg ${SED} "--bindir=/bin"
+ipkg ${LIBFFI}
+ipkg ${PYTHON} "--enable-shared"
+# Specify LIBFFI flags because pkg-config is not yet installed:
+LIBFFI_CFLAGS="-I/usr/include" LIBFFI_LIBS="-L/usr/lib -lffi" ipkg ${GLIB}
 ipkg ${PKG_CONFIG}
 ipkg ${NCURSES}
-ipkg ${UTIL_LINUX_NG}
+ipkg ${UTIL_LINUX}
 ipkg ${E2FSPROGS}
-ipkg ${COREUTILS}
+FORCE_UNSAFE_CONFIGURE=1 ipkg ${COREUTILS}
 ipkg -m noac ${IANA}
 ipkg ${MFOUR}
 ipkg ${BISON}