-Amélioré fonctions de download des packages

[hvlinux.git] / stage4 / packages-update

diff --git a/stage4/packages-update b/stage4/packages-update
index dac089b..65b82de 100755 (executable)
--- a/stage4/packages-update
+++ b/stage4/packages-update
@@ -4,17 +4,9 @@ USE_LFS_PATCHES=1
 USE_BLFS_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 ${*}
 
 lpkg     3 ${PYTHON}
 
@@ -53,7 +45,7 @@ for module in ${XORG_MODULES_LIST}; do
     SUBMODS="$(grep -v '^#' ${LFS_PKG_DIR}/${MOD_NAME}/${module}.wget | sed 's!\.tar\.bz2$!!')"
 
     for submod in ${SUBMODS}; do
-        fpkg_xorg ${submod} ${MOD_NAME}
+        fpkg -m xorg -s ${MOD_NAME} ${submod}
     done
 
     pushd ${DEST_DIR} >> ${LFS_LOG_FILE}
@@ -67,45 +59,48 @@ for module in ${XORG_MODULES_LIST}; do
     popd >> ${LFS_LOG_FILE}
 done
 
-fpkg_xorg  ${LIBXAU} lib
-fpkg_xorg  ${LIBXDMCP} lib
-fpkg_sf    ${LESSTIF}
-fpkg_xorg  ${XBITMAPS} data
-fpkg       ${LIBPTHREAD_STUBS} "http://xcb.freedesktop.org/dist"
-fpkg       ${XCB_PROTO} "http://xcb.freedesktop.org/dist"
-fpkg_gnu   ${GPERF}
-fpkg       ${XCB_UTIL} "http://xcb.freedesktop.org/dist"
+fpkg -m xorg -s lib ${LIBXAU}
+fpkg -m xorg -s lib ${LIBXDMCP}
+fpkg -m sf ${LESSTIF}
+fpkg -m xorg -s data ${XBITMAPS}
+
+fpkg -m fd -o "dist" -s "xcb" ${LIBPTHREAD_STUBS}
+fpkg -m fd -o "dist" -s "xcb" ${XCB_PROTO}
+fpkg -m fd -o "dist" -s "xcb" ${XCB_UTIL}
+fpkg -m gnu ${GPERF}
 
-fpkg_hv    ${LIBDRM}
+fpkg -m hv ${LIBDRM}
 fpkg -e "tar.gz" ${TALLOC} "http://samba.org/ftp/talloc"
-fpkg -s "$(get_pkg_ver ${MESALIB})" ${MESALIB} ftp://ftp.freedesktop.org/pub/mesa
-fpkg_xorg  ${XCURSOR_THEMES} data
-fpkg       ${XKEYBOARD_CONFIG} "http://xlibs.freedesktop.org/xkbdesc"
-fpkg_xorg  ${LUIT} app
-fpkg -e "tar.gz" ${PIXMAN} "http://cairographics.org/releases"
+fpkg -s "$(get_pkg_ver ${MESALIB})" ${MESALIB} \
+    ftp://ftp.freedesktop.org/pub/mesa
+fpkg -m xorg -s data ${XCURSOR_THEMES}
+fpkg -m fd -o "xlibs" -s "xkbdesc" ${XKEYBOARD_CONFIG}
+
+fpkg -m xorg -s app ${LUIT}
+fpkg -e "tar.gz" ${PIXMAN} ${CAIRO_URL}
 fpkg -e "tar.gz" ${LIBFFI} "ftp://sourceware.org/pub/libffi"
-fpkg       ${DBUS} "http://dbus.freedesktop.org/releases/dbus"
-fpkg_gnome ${GLIB}
-fpkg_gnome ${GOBJECT_INSTROSPECTION}
-fpkg -e "tar.gz" ${DBUS_GLIB} "http://dbus.freedesktop.org/releases/dbus-glib"
-fpkg -e "tar.gz" ${EGGDBUS} "http://hal.freedesktop.org/releases"
-fpkg -e "tar.gz" ${POLKIT} "http://hal.freedesktop.org/releases"
-fpkg       ${CONSOLEKIT} "http://www.freedesktop.org/software/ConsoleKit/dist"
-fpkg -e "tar.gz" ${POLICYKIT} "http://hal.freedesktop.org/releases"
-fpkg       ${HAL} "http://hal.freedesktop.org/releases"
-fpkg       ${HAL_INFO} "http://hal.freedesktop.org/releases"
-
-fpkg_hv    ${XORG_VIDEO_NOUVEAU}
-fpkg_xorg  ${XORG_SERVER} xserver
-fpkg_xorg  ${XDM} app
 
-fpkg -e "tgz" ${XTERM} "ftp://invisible-island.net/xterm"
+fpkg -m fd -o "releases/dbus" ${DBUS}
+fpkg -m gnome ${GLIB}
+fpkg -m gnome ${GOBJECT_INSTROSPECTION}
+fpkg -m fd -o "dbus" ${DBUS_GLIB}
+fpkg -m fd -o "hal" ${EGGDBUS}
+fpkg -m fd -o "hal" ${POLKIT}
+fpkg ${CONSOLEKIT} "http://www.freedesktop.org/software/ConsoleKit/dist"
+fpkg -m fd -o "hal" ${POLICYKIT}
+fpkg -m fd ${HAL}
+fpkg -m fd -o "hal" ${HAL_INFO}
+
+fpkg -m hv ${XORG_VIDEO_NOUVEAU}
+fpkg -m xorg -s xserver ${XORG_SERVER}
+fpkg -m xorg -s app ${XDM}
 
+fpkg -e "tgz" ${XTERM} "ftp://invisible-island.net/xterm"
 fpkg -e "tar.gz" ${T1LIB} "http://www.ibiblio.org/pub/Linux/libs/graphics"
 
-fpkg_sf ${TK} tcl
-fpkg_gnu ${EMACS}
-fpkg ${WINDOWMAKER} "http://windowmaker.info/pub/source/release"
-fpkg -e "tar.gz" ${WINDOWMAKER_EXTRA} "http://windowmaker.info/pub/source/release"
+fpkg -m sf -s "tcl" ${TK}
+fpkg -m gnu ${EMACS}
+fpkg ${WINDOWMAKER} ${WMAKER_URL}
+fpkg -e "tar.gz" ${WINDOWMAKER_EXTRA} ${WMAKER_URL}
 
 exit $?