Update stage1 shadow for new install dir option

[hvlinux.git] / stage1 / hv-install-2

diff --git a/stage1/hv-install-2 b/stage1/hv-install-2
index a063fb4..520921b 100755 (executable)
--- a/stage1/hv-install-2
+++ b/stage1/hv-install-2
@@ -2,30 +2,18 @@
 
 source ~/.bashrc
 
-# Reading system configuration informations, functions and package versions.
-source ../sysinfos
-source ../functions
-source ../packages-list
+source ../functions/main
 
 init_log_file
 
 # Building temporary system
 
-HOST_CC=gcc CPPFLAGS=-fexceptions \
-    ipkg ${GMP} "--enable-cxx"
-ipkg ${MPFR} "--enable-shared"
+ipkg ${GMP} "--enable-cxx"
+ipkg ${MPFR}
 ipkg ${MPC}
-ipkg ${PPL} "\
-    --enable-shared \
-    --enable-interfaces=c,cxx \
-    --disable-optimization \
-    --with-libgmp-prefix=/tools \
-    --with-libgmpxx-prefix=/tools"
-ipkg ${CLOOG_PPL} "\
-    --enable-shared \
-    --with-bits=gmp \
-    --with-gmp=/tools \
-    --with-ppl=/tools"
+ipkg ${ISL}
+ipkg ${CLOOG} "\
+    --with-isl=system"
 ipkg -m acnb ${ZLIB}
 ipkg ${BINUTILS}
 ipkg ${GCC}
@@ -38,7 +26,7 @@ ipkg ${NCURSES} "\
 ipkg ${BASH} "--without-bash-malloc"
 ipkg ${BISON}
 ipkg -m noac ${BZIP2}
-ipkg ${COREUTILS} "--enable-install-program=hostname"
+ipkg -m acnb -j ${COREUTILS} "--enable-install-program=hostname"
 ipkg ${DIFFUTILS}
 ipkg ${FINDUTILS}
 ipkg ${FILE_PKG}
@@ -62,12 +50,22 @@ rscr once "Creating directory structure" create-directories
 rscr once "Creating symbolic links" create-symlinks
 
 ipkg ${NANO} "--enable-color --enable-multibuffer"
-ipkg ${UTIL_LINUX_NG}
-ipkg ${E2FSPROGS}
+PKG_CONFIG=true \
+    ipkg ${UTIL_LINUX} "\
+        --exec-prefix=/tools \
+        --disable-login \
+        --disable-sulogin \
+        --disable-su \
+        --disable-makeinstall-chown"
+ipkg -i ${LFS} ${SHADOW} "\
+    --sysconfdir=/etc \
+    --cache-file=config.cache"
+LDFLAGS="-Wl,-lpthread,-ldl" \
+    ipkg ${E2FSPROGS}
 ipkg -m noac ${SYSVINIT}
-ipkg ${MODULE_INIT_TOOLS}
-ipkg ${UDEV}
-ipkg -m noac ${KERNEL}
+ipkg ${KMOD}
+ipkg ${EUDEV}
+ipkg -c -m noac ${KERNEL}
 
 rscr once "Creating default users" create-users
 rscr once "Creating default groups" create-groups