Remove installation of ncurses and file at stage0

diff --git a/stage0/hv-install-2 b/stage0/hv-install-2
index 5c9d66b..d4ae7b4 100755 (executable)
--- a/stage0/hv-install-2
+++ b/stage0/hv-install-2
@@ -9,13 +9,6 @@ if [ x"${INSTALL_GLIBC}" == x"1" ]; then
     ipkg -m noac ${KERNEL}
 fi
 
-case "${HVL_TARGET}" in
-    x86*)
-        ipkg ${FILE_PKG}
-        ipkg ${NCURSES}
-        ;;
-esac
-
 ipkg ${GMP} "\
     --enable-cxx \
     --disable-static"

diff --git a/stage0/packages-update b/stage0/packages-update
index 569318d..167e9de 100755 (executable)
--- a/stage0/packages-update
+++ b/stage0/packages-update
@@ -14,8 +14,6 @@ if [ x"${INSTALL_GLIBC}" == x"1" ]; then
     fi
 fi
 
-fpkg -e "tar.gz" ${FILE_PKG} "ftp://ftp.astron.com/pub/file"
-fpkg -m gnu ${NCURSES}
 fpkg -m gnu ${GMP}
 fpkg -m gnu ${MPFR}
 fpkg -e "tar.gz" ${MPC} "http://www.multiprecision.org/mpc/download"

diff --git a/stage1/packages-update b/stage1/packages-update
index 6623452..0d1a194 100755 (executable)
--- a/stage1/packages-update
+++ b/stage1/packages-update
@@ -12,11 +12,11 @@ lpkg 0 ${ISL}
 lpkg 0 ${CLOOG}
 lpkg 0 ${BINUTILS}
 lpkg 0 ${GCC}
-lpkg 0 ${NCURSES}
-lpkg 0 ${FILE_PKG}
 lpkg 0 ${KERNEL}
 
 # New packages for stage 1:
+fpkg -e "tar.gz" ${FILE_PKG} "ftp://ftp.astron.com/pub/file"
+fpkg -m gnu ${NCURSES}
 fpkg ${ZLIB} "http://www.zlib.net"
 fpkg -m gnu ${BASH}
 fpkg -m gnu ${BISON}

diff --git a/stage2/packages-update b/stage2/packages-update
index 86ca8b7..3b7f874 100755 (executable)
--- a/stage2/packages-update
+++ b/stage2/packages-update
@@ -14,10 +14,10 @@ lpkg 0 ${ISL}
 lpkg 0 ${CLOOG}
 lpkg 0 ${BINUTILS}
 lpkg 0 ${GCC}
-lpkg 0 ${NCURSES}
-lpkg 0 ${FILE_PKG}
 
 # These packages were already downloaded for stage1:
+lpkg 1 ${NCURSES}
+lpkg 1 ${FILE_PKG}
 lpkg 1 ${NANO}
 lpkg 1 ${ZLIB}
 lpkg 1 ${SED}