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

diff --git a/stage2/hv-install-1 b/stage2/hv-install-1
index 2e3cc41..65f9a7d 100755
--- a/stage2/hv-install-1
+++ b/stage2/hv-install-1
@@ -1,25 +1,18 @@
 #!/bin/bash
 
-# Reading system configuration informations, functions and package versions.
-source ../config/sysinfos
-source ../functions
-hvtrap_setup
-source ../config/packages-list
+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
 
@@ -33,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
@@ -44,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}