Ajout git et librairie ncurses pour hvlinux

[hvlinux.git] / stage2 / install-1

diff --git a/stage2/install-1 b/stage2/install-1
index 279066d..61b542c 100755 (executable)
--- a/stage2/install-1
+++ b/stage2/install-1
@@ -1,15 +1,10 @@
 #!/bin/bash
-
-LFS_STAGE=stage2
-
-export LFS_PKG_DIR="$(dirname $(pwd))/packages/${LFS_STAGE}"
-export LFS_LOG_DIR=/var/log/hvlinux-install/${LFS_STAGE}
-export LFS_LOG_FILE=${LFS_LOG_DIR}/install.log
-export LFS_TMP=/tmp
+set -o errtrace # Let shell functions inherit ERR trap.  Same as `set -E'.
 
 # Reading system configuration informations, functions and package versions.
 source ../sysinfos
 source ../functions
+hvtrap_setup
 source ../packages-list
 source /etc/profile
 
@@ -20,9 +15,6 @@ fi
 
 init_log_file
 
-# Scripts directory
-export SCRDIR=$(pwd)
-
 ipkg -l "${PERL}-pass1" ${PERL}
 ipkg -m noac ${KERNEL}
 ipkg -m noac ${MANPAGES}
@@ -46,7 +38,7 @@ unset CC
 unset CXX
 unset LDFLAGS
 
-ipkg ${ZLIB}
+ipkg -m acnb ${ZLIB}
 ipkg ${BINUTILS}
 ipkg ${GCC}
 rscr mult "Testing toolchain" toolchain-test