Stage2 semble compléter ok

[hvlinux.git] / stage1 / install-1

diff --git a/stage1/install-1 b/stage1/install-1
index 5a8a9cf..a7bd542 100755 (executable)
--- a/stage1/install-1
+++ b/stage1/install-1
@@ -1,111 +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   ${MPC}
-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_ac   ${ZLIB}
-ipkg_ac   ${BINUTILS} "\
-    --target=${CLFS_TARGET} \
-    --with-lib-path=/tools/lib \
-    --disable-nls \
-    --enable-shared \
-    --disable-multilib"
-ipkg_ac   ${GCC} "\
-    --target=${CLFS_TARGET} \
-    --disable-multilib \
-    --with-local-prefix=/tools \
-    --libexecdir=/tools/lib \
-    --disable-nls \
-    --disable-libstdcxx-pch \
-    --enable-long-long \
-    --enable-c99 \
-    --enable-shared \
-    --enable-threads=posix \
-    --enable-__cxa_atexit \
-    --enable-languages=c,c++"
-ipkg_ac   ${NCURSES} "\
-    --with-shared \
-    --without-debug \
-    --without-ada \
-    --enable-overwrite \
-    --with-build-cc=gcc"
-ipkg_ac   ${BASH} "--without-bash-malloc"
-ipkg_ac   ${BISON}
-ipkg_ac   ${BZIP2}
-ipkg_ac   ${COREUTILS} "--enable-install-program=hostname"
-ipkg_ac   ${DIFFUTILS}
-ipkg_ac   ${FINDUTILS}
-ipkg_ac   ${FILE_PKG}
-ipkg_ac   ${FLEX}
-ipkg_ac   ${GAWK}
-ipkg_ac   ${GETTEXT} "--disable-shared"
-ipkg_ac   ${GREP} "\
-    --disable-perl-regexp \
-    --without-included-regex"
-ipkg_ac   ${GZIP}
-ipkg_ac   ${MFOUR}
-ipkg_ac   ${MAKE_PACKAGE}
-ipkg_ac   ${PATCH_PACKAGE}
-ipkg_ac   ${SED}
-ipkg_ac   ${TAR_PACKAGE}
-ipkg_ac   ${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_ac   ${UTIL_LINUX_NG}
-ipkg_ac   ${E2FSPROGS}
-ipkg_ac   ${SYSVINIT}
-ipkg_ac   ${MODULE_INIT_TOOLS}
-ipkg_ac   ${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