-Déplacé nano du stage3 au stage 2 (car causait problème vu qu'on enlève /tools à...

[hvlinux.git] / stage0 / install-1

diff --git a/stage0/install-1 b/stage0/install-1
index 755a345..1d6b6c8 100755 (executable)
--- a/stage0/install-1
+++ b/stage0/install-1
@@ -1,48 +1,20 @@
 #!/bin/bash
 
-source ~/.bashrc
-
-LFS_STAGE=stage0
-
 # Reading system configuration informations, functions and package versions.
 source ../sysinfos
 source ../functions
+hvtrap_setup
 source ../packages-list
 
-export LFS_PKG_DIR="$(dirname $(pwd))/packages/${LFS_STAGE}"
-export LFS_LOG_DIR=${LFS}/var/log/hvlinux-install/${LFS_STAGE}
-export LFS_LOG_FILE=${LFS_LOG_DIR}/install.log
-export LFS_TMP="${LFS}/tmp"
-
 init_log_file
 
-ipkg_cust ${KERNEL}   cis-linux-api-headers
-
-case "${HVL_TARGET}" in
-    x86*)
-        ipkg_ac   ${FILE_PKG}
-        ipkg_cust ${NCURSES}  cis-ncurses "--without-debug --without-shared"
-        ;;
-esac
-
-CPPFLAGS=-fexceptions \
-    ipkg_ac   ${GMP}  "--enable-cxx"
-LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
-    ipkg_ac   ${MPFR} "--enable-shared --with-gmp=/cross-tools"
+rscr mult "Performing pre-install" pre-install
 
-LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
-    ipkg_ac   ${PPL}  "--enable-shared \
-        --enable-interfaces=c,cxx \
-        --disable-optimization \
-        --with-libgmp-prefix=/cross-tools \
-        --with-libgmpxx-prefix=/cross-tools"
-LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
-    ipkg_cust ${CLOOG_PPL} cis-cloog-ppl "--enable-shared --with-bits=gmp \
-        --with-gmp=/cross-tools --with-ppl=/cross-tools"
+# Logging-in as 'lfs' user, and executing the install-2 script. The
+# 'su -' command starts with a clean environment and enters the home
+# directory of the user.
+su - lfs -c "cd ${PWD}; ./install-2"
 
-ipkg_cust ${BINUTILS} cis-binutils
-ipkg      ${GCC} cis-gcc-pass1 "${GCC}-pass1"
-ipkg_cust ${EGLIBC} cis-eglibc
-ipkg      ${GCC} cis-gcc-pass2 "${GCC}-pass2"
+echo "Total build time: $(get_total_build_time ${LFS_LOG_FILE})h"
 
-exit $?
+exit 0