Stage2 semble compléter ok

[hvlinux.git] / stage3 / packages-update

diff --git a/stage3/packages-update b/stage3/packages-update
index 35b5fe5..1f1f272 100755 (executable)
--- a/stage3/packages-update
+++ b/stage3/packages-update
@@ -1,6 +1,5 @@
-#!/bin/sh
+#!/bin/bash
 
-LFS_STAGE="stage3"
 USE_LFS_PATCHES=1
 USE_BLFS_PATCHES=1
 USE_HV_PATCHES=1
@@ -13,6 +12,10 @@ source ../packages-list
 
 update_packages_init
 
+if [ ${#} -eq 1 -a "x${1}" = "xtest" ]; then
+    export TEST_INTEGRITY=1
+fi
+
 # These packages were already downloaded for stage1:
 lpkg     1 ${NANO}
 
@@ -52,17 +55,16 @@ fpkg_sf    ${DDCLIENT}
 fpkg       ${LIBPCAP} "http://www.tcpdump.org/release"
 fpkg       ${TCPDUMP} "http://www.tcpdump.org/release"
 fpkg       ${NMAP} "http://download.insecure.org/nmap/dist"
-ARCH_EXT=tar.gz fpkg ${BIND} "http://gd.tuwien.ac.at/infosys/servers/isc/bind9/$(get_pkg_ver ${BIND})"
-unset ARCH_EXT
+fpkg -e "tar.gz" -s "$(get_pkg_ver ${BIND})" ${BIND} "http://gd.tuwien.ac.at/infosys/servers/isc/bind9"
 fpkg       ${IPTABLES} "http://www.netfilter.org/projects/iptables/files"
 fpkg       ${CURL} "http://curl.haxx.se/download"
 fpkg       ${RSYNC} "http://samba.org/ftp/rsync/src"
 
 fpkg       ${MYSQL} "ftp://mirror.mcs.anl.gov/pub/mysql/Downloads/MySQL-$(get_pkg_ver_base ${MYSQL})"
 
-fpkg_mis   ${ZIP} "zip$(get_pkg_ver ${ZIP} | sed 's!\.!!g')" ${SOURCEFORGE_URL}/infozip
-fpkg_mis   ${UNZIP} "unzip$(get_pkg_ver ${UNZIP} | sed 's!\.!!g')" ${SOURCEFORGE_URL}/infozip
-fpkg_mis   ${UNRAR} "unrarsrc-$(get_pkg_ver ${UNRAR})" "http://www.rarlab.com/rar"
+fpkg -f "zip$(get_pkg_ver ${ZIP} | sed 's!\.!!g')"     -s "infozip" ${ZIP}   ${SOURCEFORGE_URL}
+fpkg -f "unzip$(get_pkg_ver ${UNZIP} | sed 's!\.!!g')" -s "infozip" ${UNZIP} ${SOURCEFORGE_URL}
+fpkg -f "unrarsrc-$(get_pkg_ver ${UNRAR})" ${UNRAR} "http://www.rarlab.com/rar"
 fpkg_gnu   ${CPIO}
 
 fpkg_gnu   ${PARTED}
@@ -82,8 +84,7 @@ fpkg       ${PERL_MOD_XML_PARSER} "http://www.cpan.org/modules/by-module/XML"
 fpkg_gnome ${INTLTOOL}
 fpkg       ${PYTHON} "http://www.python.org/ftp/python/$(get_pkg_ver ${PYTHON})"
 
-ARCH_EXT=tgz fpkg ${SGML_COMMON} "http://gd.tuwien.ac.at/hci/kde/devel/docbook/SOURCES"
-unset ARCH_EXT
+fpkg -e "tgz" ${SGML_COMMON} "http://gd.tuwien.ac.at/hci/kde/devel/docbook/SOURCES"
 fpkg_hv    ${SGML_DTD3}
 fpkg_hv    ${SGML_DTD4}
 fpkg_sf    ${OPENSP} "openjade"
@@ -98,8 +99,8 @@ fpkg_sf    ${DOCBOOK_XSL} "docbook"
 fpkg_sf    ${XMLTOMAN}
 fpkg       ${XMLTO} "https://fedorahosted.org/releases/x/m/xmlto"
 
-fpkg_mis   ${LIBJPEG} "jpegsrc.v$(get_pkg_ver ${LIBJPEG})" "http://www.ijg.org/files"
-fpkg_mis   ${LIBOPENJPEG} "openjpeg_v$(get_pkg_ver ${LIBOPENJPEG} | sed 's!\.!_!g')" "http://www.openjpeg.org"
+fpkg -f "jpegsrc.v$(get_pkg_ver ${LIBJPEG})" ${LIBJPEG} "http://www.ijg.org/files"
+fpkg -f "openjpeg_v$(get_pkg_ver ${LIBOPENJPEG} | sed 's!\.!_!g')" ${LIBOPENJPEG} "http://www.openjpeg.org"
 fpkg_sf    ${LIBPNG}
 fpkg_gnome ${LIBART}
 fpkg_sf    ${LIBEXIF}