X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage2%2Finstall-1;h=94ca72f251a0e15b4fa1ba6d83ee4e988e7b880c;hb=b7d1d99f41dcf50a8635f608679947f4455a0c7c;hp=7d34e49b9daa96af6ef344e476c46a4c7a2166a9;hpb=16cc35ba4890382ee9368a176e4f5a7fa773b7a6;p=hvlinux.git

diff --git a/stage2/install-1 b/stage2/install-1
index 7d34e49..94ca72f 100755
--- a/stage2/install-1
+++ b/stage2/install-1
@@ -1,42 +1,66 @@
-#!/bin/sh
+#!/bin/bash
 
 # Reading system configuration informations, functions and package versions.
 source ../sysinfos
 source ../functions
+hvtrap_setup
 source ../packages-list
+source /etc/profile
 
-export LFS_PKG_DIR="$(dirname $(dirname $(pwd)))/packages/stage2"
-export LFS_LOG_DIR=/var/log/hvlinux-install/stage2
-export LFS_LOG_FILE=${LFS_LOG_DIR}/install.log
-export LFS_TMP="/tmp"
+if [ "x${USER}" != "xroot" ]; then
+    echo "You must be the superuser to install hvlinux."
+    exit 1
+fi
 
 init_log_file
 
-export CFLAGS="-pipe -march=${MACHINE_ARCHITECTURE} -O2"
-export CXXFLAGS=${CFLAGS}
-
-ipkg           ${KERNEL} cis-kernel
-ipkg           ${MANPAGES} cis-man-pages
-ipkg           ${GLIBC} cis-glibc
-run_script_log "toolchain-adjust-stage2" cis-toolchain-adjust
-ipkg           ${BINUTILS} cis-binutils
-ipkg           ${GCC_CORE} cis-gcc
-ipkg           ${DB4} cis-db4
-ipkg_ac        ${SED} "--bindir=/bin --enable-html"
-ipkg           ${E2FSPROGS} cis-e2fsprogs
-ipkg           ${COREUTILS} cis-coreutils
-ipkg           ${IANA} cis-iana
-ipkg_ac        ${MFOUR}
-ipkg           ${BISON} cis-bison
-ipkg           ${NCURSES} cis-ncurses
-ipkg           ${PROCPS} cis-procps
-ipkg_ac        ${LIBTOOL}
-ipkg           ${PERL} cis-perl
-ipkg           ${READLINE} cis-readline
-ipkg           ${ZLIB} cis-zlib
-ipkg_ac        ${AUTOCONF}
-ipkg_ac        ${AUTOMAKE}
-ipkg_ac        ${BASH} "--bindir=/bin --without-bash-malloc --with-installed-readline"
+rscr mult "Performing pre-install" pre-install
+
+ipkg -l "${PERL}-pass1" ${PERL}
+ipkg -m noac ${KERNEL}
+ipkg -m noac ${MANPAGES}
+ipkg ${EGLIBC}
+rscr once "Adjusting toolchain" toolchain-adjust
+rscr mult "Testing toolchain"   toolchain-test
+
+export CC="gcc -isystem /usr/include"
+export CXX="g++ -isystem /usr/include"
+export LDFLAGS="-Wl,-rpath-link,/lib"
+
+CPPFLAGS=-fexceptions \
+    ipkg ${GMP} "--enable-cxx --enable-mpbsd"
+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"
+
+unset CC
+unset CXX
+unset LDFLAGS
+
+ipkg -m acnb ${ZLIB}
+ipkg ${BINUTILS}
+ipkg ${GCC}
+rscr mult "Testing toolchain" toolchain-test
+ipkg ${SED} "--bindir=/bin"
+ipkg ${PKG_CONFIG}
+ipkg ${NCURSES}
+ipkg ${UTIL_LINUX_NG}
+ipkg ${E2FSPROGS}
+ipkg ${COREUTILS}
+ipkg -m noac ${IANA}
+ipkg ${MFOUR}
+ipkg ${BISON}
+ipkg -m noac ${PROCPS}
+ipkg ${LIBTOOL}
+ipkg ${FLEX}
+ipkg -m noac ${IPROUTE2}
+ipkg -l "${PERL}-pass2" ${PERL}
+ipkg ${READLINE}
+ipkg ${AUTOCONF}
+ipkg ${AUTOMAKE}
+ipkg ${BASH} "--bindir=/bin --without-bash-malloc --with-installed-readline"
 
 /bin/bash +h -c ./install-2