-#!/bin/sh
+#!/bin/bash
-LFS_STAGE="stage1"
+USE_CLFS_PATCHES=1
+USE_HV_PATCHES=1
-# Reading system configuration informations, functions and package versions.
-source ../sysinfos
-source ../functions
-source ../functions-update
-source ../packages-list
+source ../functions/main
-update_packages_init
+update_packages_init ${*}
-# Begin
+# These packages are already downloaded for stage0:
+lpkg 0 ${GMP}
+lpkg 0 ${MPFR}
+lpkg 0 ${MPC}
+lpkg 0 ${PPL}
+lpkg 0 ${CLOOG_PPL}
+lpkg 0 ${BINUTILS}
+lpkg 0 ${GCC}
+lpkg 0 ${NCURSES}
+lpkg 0 ${FILE_PKG}
+lpkg 0 ${KERNEL}
-fpkg_gnu ${BINUTILS}
-fpkg ${GCC_CORE} ${GNU_URL}/gcc/${GCC_CORE}
-fpkg ${KERNEL} http://www.kernel.org/pub/linux/kernel/v2.6
-fpkg_gnu ${GLIBC}
-fpkg_gnu ${NCURSES}
-fpkg_gnu ${BASH}
-fpkg ${BZIP2} http://www.bzip.org/$(get_pkg_ver ${BZIP2})
-fpkg_gnu ${COREUTILS}
-fpkg_gnu ${DIFFUTILS}
-fpkg_gnu ${FINDUTILS}
-fpkg_gnu ${GAWK}
-fpkg_gnu ${GETTEXT}
-fpkg_gnu ${GREP}
-fpkg_gnu ${GZIP}
-fpkg_gnu ${MAKE_PACKAGE}
-fpkg_gnu ${PATCH_PACKAGE}
-fpkg_gnu ${SED}
-fpkg_gnu ${TAR_PACKAGE}
-fpkg_gnu ${TEXINFO}
-fpkg ${UTIL_LINUX} http://www.kernel.org/pub/linux/utils/util-linux
+# New packages for stage 1:
+fpkg ${ZLIB} "http://www.zlib.net"
+fpkg -m gnu ${BASH}
+fpkg -m gnu ${BISON}
+fpkg -e "tar.gz" ${BZIP2} "http://www.bzip.org/$(get_pkg_ver ${BZIP2})"
+fpkg -m gnu ${COREUTILS}
+fpkg -m gnu ${DIFFUTILS}
+fpkg -m gnu ${FINDUTILS}
+fpkg -m sf ${FLEX}
+fpkg -m gnu ${GAWK}
+fpkg -m gnu ${GETTEXT}
+fpkg -m gnu ${GREP}
+fpkg -m gnu ${GZIP}
+fpkg -m gnu ${MFOUR}
+fpkg -m gnu ${MAKE_PACKAGE}
+fpkg -m gnu ${PATCH_PACKAGE}
+fpkg -m gnu ${SED}
+fpkg -m gnu ${TAR_PACKAGE}
+fpkg -m gnu ${TEXINFO}
+fpkg -m gnu ${NANO}
+fpkg ${XZ_UTILS} "http://tukaani.org/xz"
+
+# Chapter 7
+fpkg -s "linux/utils/util-linux/v$(get_pkg_ver_base ${UTIL_LINUX})" \
+ ${UTIL_LINUX} ${KERNEL_URL}
+fpkg -m sf ${E2FSPROGS}
+fpkg ${SYSVINIT} "http://download.savannah.gnu.org/releases/sysvinit"
+fpkg -s "linux/utils/kernel/module-init-tools" ${MODULE_INIT_TOOLS} \
+ ${KERNEL_URL}
+fpkg -s "linux/utils/kernel/hotplug" ${UDEV} ${KERNEL_URL}
-# Return last error
exit $?