Stage2 semble compléter ok

[hvlinux.git] / stage1 / install-1

diff --git a/stage1/install-1 b/stage1/install-1
index 479496f..a7bd542 100755 (executable)
--- a/stage1/install-1
+++ b/stage1/install-1
@@ -1,86 +1,22 @@
 #!/bin/bash
-set -o errexit
-
-source ~/.bashrc
 
 # Reading system configuration informations, functions and package versions.
 source ../sysinfos
 source ../functions
+hvtrap_setup
 source ../packages-list
 
-export LFS_PKG_DIR="$(dirname $(pwd))/packages/stage1"
-export LFS_LOG_DIR=${LFS}/var/log/hvlinux-install/stage1
-export LFS_LOG_FILE=${LFS_LOG_DIR}/install.log
-export LFS_TMP="${LFS}/tmp"
-
 init_log_file
 
-# Building temporary system
-export CC="${CLFS_TARGET}-gcc"
-export CXX="${CLFS_TARGET}-g++"
-export AR="${CLFS_TARGET}-ar"
-export AS="${CLFS_TARGET}-as"
-export RANLIB="${CLFS_TARGET}-ranlib"
-export LD="${CLFS_TARGET}-ld"
-export STRIP="${CLFS_TARGET}-strip"
-
-# Scripts directory
-export SCRDIR=$(pwd)
-
-HOST_CC=gcc CPPFLAGS=-fexceptions \
-    ipkg_ac   ${GMP} "--enable-cxx"
-ipkg_ac   ${MPFR} "--enable-shared"
-ipkg_ac   ${PPL} "\
-    --enable-shared \
-    --enable-interfaces=c,cxx \
-    --disable-optimization \
-    --with-libgmp-prefix=/tools \
-    --with-libgmpxx-prefix=/tools"
-ipkg_ac   ${CLOOG_PPL} "\
-    --enable-shared \
-    --with-bits=gmp \
-    --with-gmp=/tools \
-    --with-ppl=/tools"
-ipkg_cust ${ZLIB} cis-zlib
-ipkg_cust ${BINUTILS} cis-binutils
-ipkg_cust ${GCC} cis-gcc
-ipkg_ac   ${NCURSES} "--with-shared --without-debug --without-ada --enable-overwrite --with-build-cc=gcc"
-ipkg_cust ${BASH} cis-bash
-ipkg_ac   ${BISON}
-ipkg_cust ${BZIP2} cis-bzip2
-ipkg_cust ${COREUTILS} cis-coreutils
-ipkg_ac   ${DIFFUTILS}
-ipkg_cust ${FINDUTILS} cis-findutils
-ipkg_ac   ${FILE_PKG}
-ipkg_cust ${FLEX} cis-flex
-ipkg_ac   ${GAWK} "--disable-libsigsegv"
-ipkg_cust ${GETTEXT} cis-gettext
-ipkg_ac   ${GREP} "--disable-perl-regexp --without-included-regex"
-ipkg_ac   ${GZIP}
-ipkg_cust ${MFOUR} cis-m4
-ipkg_ac   ${MAKE_PACKAGE}
-ipkg_ac   ${PATCH_PACKAGE}
-ipkg_ac   ${SED}
-ipkg_cust ${TAR_PACKAGE} cis-tar
-ipkg_cust ${TEXINFO} cis-texinfo
-ipkg_ac   ${XZ_UTILS}
+rscr mult "Performing pre-install" pre-install
 
-# Chapter 7
-rscr once "Creating directory structure" create-directories
-rscr once "Creating symbolic links" create-symlinks
+# 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_ac   ${NANO} --enable-color --enable-multibuffer
-ipkg_cust ${UTIL_LINUX_NG} cis-util-linux-ng
-ipkg_cust ${E2FSPROGS} cis-e2fsprogs
-ipkg_cust ${SYSVINIT} cis-sysvinit
-ipkg_cust ${MODULE_INIT_TOOLS} cis-module-init-tools
-ipkg_cust ${UDEV} cis-udev
+rscr mult "Performing post-install" post-install
 
-rscr once "Creating default users" create-users
-rscr once "Creating default groups" create-groups
-rscr once "Creating default log files" create-logfiles
-rscr once "Installing kernel sources" install-linux-minimal
-rscr once "Creating default config files" create-config-files
-rscr once "Installing bootscripts" cis-bootscripts
+echo "Total build time: $(get_total_build_time ${LFS_LOG_FILE})h"
 
-exit $?
+exit 0