-Amélioré fonctions de download des packages

[hvlinux.git] / stage1 / packages-update

diff --git a/stage1/packages-update b/stage1/packages-update
index ca445b2..dfae254 100755 (executable)
--- a/stage1/packages-update
+++ b/stage1/packages-update
@@ -3,57 +3,51 @@
 USE_CLFS_PATCHES=1
 USE_HV_PATCHES=1
 
-# Reading system configuration informations, functions and package versions.
-source ../config/sysinfos
-source ../functions
-source ../functions-fpkg
-source ../config/packages-list
+source ../functions/main
 
-update_packages_init
-
-if [ ${#} -eq 1 -a "x${1}" = "xtest" ]; then
-    export TEST_INTEGRITY=1
-fi
+update_packages_init ${*}
 
 # 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}
+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}
 
 # New packages for stage 1:
-fpkg       ${ZLIB} "http://www.zlib.net"
-fpkg_gnu   ${BASH}
-fpkg_gnu   ${BISON}
-fpkg       ${BZIP2} "http://www.bzip.org/$(get_pkg_ver ${BZIP2})"
-fpkg_gnu   ${COREUTILS}
-fpkg_gnu   ${DIFFUTILS}
-fpkg_gnu   ${FINDUTILS}
-fpkg_sf    ${FLEX}
-fpkg_gnu   ${GAWK}
-fpkg_gnu   ${GETTEXT}
-fpkg_gnu   ${GREP}
-fpkg_gnu   ${GZIP}
-fpkg_gnu   ${MFOUR}
-fpkg_gnu   ${MAKE_PACKAGE}
-fpkg_gnu   ${PATCH_PACKAGE}
-fpkg_gnu   ${SED}
-fpkg_gnu   ${TAR_PACKAGE}
-fpkg_gnu   ${TEXINFO}
-fpkg_gnu   ${NANO}
-fpkg       ${XZ_UTILS} "http://tukaani.org/xz"
+fpkg ${ZLIB} "http://www.zlib.net"
+fpkg -m gnu ${BASH}
+fpkg -m gnu ${BISON}
+fpkg ${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       ${UTIL_LINUX_NG} "http://www.kernel.org/pub/linux/utils/util-linux-ng/v$(get_pkg_ver_base ${UTIL_LINUX_NG})"
-fpkg_sf    ${E2FSPROGS}
-fpkg       ${SYSVINIT} "ftp://ftp.cistron.nl/pub/people/miquels/sysvinit"
-fpkg       ${MODULE_INIT_TOOLS} "http://www.kernel.org/pub/linux/utils/kernel/module-init-tools"
-fpkg       ${UDEV} "http://www.kernel.org/pub/linux/utils/kernel/hotplug"
+fpkg -s "linux/utils/util-linux-ng/v$(get_pkg_ver_base ${UTIL_LINUX_NG})" \
+    ${UTIL_LINUX_NG} ${KERNEL_URL}
+fpkg -m sf ${E2FSPROGS}
+fpkg ${SYSVINIT} "ftp://ftp.cistron.nl/pub/people/miquels/sysvinit"
+fpkg -s "linux/utils/kernel/module-init-tools" ${MODULE_INIT_TOOLS} \
+    ${KERNEL_URL}
+fpkg -s "linux/utils/kernel/hotplug" ${UDEV} ${KERNEL_URL}
 
 exit $?