X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage3%2Fpackages-update;h=17826baccd739803fb391dbfa7f5dc005a1fad95;hb=76d0fb8907b4f4d497ff9f6d20293907ff2a5589;hp=0ebc51c1a69e33de080ca10608aeb3b9b0afd068;hpb=9e3f8101a7e4d974db8e9afeb9c90c13a43ae8d7;p=hvlinux.git

diff --git a/stage3/packages-update b/stage3/packages-update
index 0ebc51c..17826ba 100755
--- a/stage3/packages-update
+++ b/stage3/packages-update
@@ -4,112 +4,108 @@ USE_LFS_PATCHES=1
 USE_BLFS_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
-
-if [ ${#} -eq 1 -a "x${1}" = "xtest" ]; then
-    export TEST_INTEGRITY=1
-fi
-
-# These packages were already downloaded for stage1:
-lpkg     1 ${NANO}
+update_packages_init ${*}
 
 # These packages are only for stage3
-fpkg_gnu   ${WHICH}
-fpkg       ${PCIUTILS} ftp://ftp.kernel.org/pub/software/utils/pciutils
-fpkg_sf    ${LIBUSB}
-fpkg_sf    ${LIBUSB_COMPAT} libusb
-fpkg       ${USBUTILS} ${SOURCEFORGE_URL}/project/linux-usb/usbutils
-fpkg       ${REISERFSPROGS} http://www.kernel.org/pub/linux/utils/fs/reiserfs
-fpkg       ${POPT} http://rpm5.org/files/popt
-fpkg       ${PAM} http://www.kernel.org/pub/linux/libs/pam/library
-fpkg -e "tar.gz" -f "${FCRON}.src" ${FCRON} http://fcron.free.fr/archives
-fpkg       ${OPENSSL} ftp://ftp.openssl.org/source
-fpkg       ${OPENSSL_ROOT_CERTS} http://anduin.linuxfromscratch.org/files/BLFS
-fpkg       ${OPENSSH} ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable
-fpkg       ${LYNX} http://lynx.isc.org/current
-fpkg_sf    ${EXPAT}
-fpkg       ${APR}      http://apache.sunsite.ualberta.ca/apr
-fpkg       ${APR_UTIL} http://apache.sunsite.ualberta.ca/apr
-fpkg       ${NEON}     http://www.webdav.org/neon
-fpkg_sf    ${TCL} tcl
-fpkg       ${SQLITE} http://www.sqlite.org
-fpkg       ${SUBVERSION} http://subversion.tigris.org/downloads
-fpkg       ${SUDO} http://www.sudo.ws/sudo/dist
-fpkg_sf    ${STRACE}
-fpkg_sf    ${PCRE}
-
-fpkg_gnu   ${WGET}
-fpkg       ${TCPWRAPPERS} ftp://ftp.porcupine.org/pub/security
-fpkg       ${PORTMAP} http://neil.brown.name/portmap
-fpkg       ${NFS_UTILS} ftp://ftp.kernel.org/pub/linux/utils/nfs
-fpkg       ${XINETD} "http://www.xinetd.org"
-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"
-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 -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 -m gnu ${WHICH}
+fpkg -s "utils/pciutils" ${PCIUTILS} ${KERNEL_URL}
+fpkg -m sf -e "tar.bz2" ${LIBUSB}
+fpkg -m sf -e "tar.bz2" -s "libusb" ${LIBUSB_COMPAT}
+fpkg -m sf -s "linux-usb/usbutils" ${USBUTILS}
+fpkg -s "linux/utils/fs/reiserfs" ${REISERFSPROGS} ${KERNEL_URL}
+fpkg -e "tar.gz" ${POPT} "http://rpm5.org/files/popt"
+fpkg -s "linux/libs/pam/library" ${PAM} ${KERNEL_URL}
+fpkg -e "tar.gz" -f "${FCRON}.src" ${FCRON} "http://fcron.free.fr/archives"
+fpkg -e "tar.gz" ${OPENSSL} "ftp://ftp.openssl.org/source"
+fpkg ${OPENSSL_ROOT_CERTS} "http://anduin.linuxfromscratch.org/files/BLFS"
+fpkg -e "tar.gz" ${OPENSSH} "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable"
+fpkg ${LYNX} "http://lynx.isc.org/current"
+fpkg -m sf ${EXPAT}
+fpkg -m apa ${APR}
+fpkg -m apa -s apr ${APR_UTIL}
+fpkg -e "tar.gz" ${NEON} "http://www.webdav.org/neon"
+fpkg -m sf -s "tcl" ${TCL}
+fpkg -e "tar.gz" ${SQLITE} "http://www.sqlite.org"
+fpkg ${SUBVERSION} "http://subversion.tigris.org/downloads"
+fpkg ${SUDO} "http://www.sudo.ws/sudo/dist"
+fpkg -m sf -e "tar.bz2" ${STRACE} 
+fpkg -m sf ${PCRE}
+
+fpkg -m gnu ${WGET}
+fpkg ${TCPWRAPPERS} "ftp://ftp.porcupine.org/pub/security"
+fpkg ${PORTMAP} "http://neil.brown.name/portmap"
+fpkg -s "linux/utils/nfs" ${NFS_UTILS} ${KERNEL_URL}
+fpkg -e "tar.gz" ${XINETD} "http://www.xinetd.org"
+fpkg -m sf ${DDCLIENT}
+fpkg -e "tar.gz" ${LIBPCAP} ${TCPDUMP_URL}
+fpkg -e "tar.gz" ${TCPDUMP} ${TCPDUMP_URL}
+fpkg ${NMAP} "http://download.insecure.org/nmap/dist"
+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 -m hv ${GETDATE}
+fpkg -e "tar.gz" ${MYSQL} \
+    "http://anduin.linuxfromscratch.org/sources/BLFS/svn/m"
+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 -m gnu ${CPIO}
 
-fpkg_gnu   ${PARTED}
-fpkg_gnu   ${ED}
-fpkg_gnu   ${BC}
-fpkg_sf    ${FUSE}
-fpkg       ${DOSFSTOOLS} "http://www.daniel-baumann.ch/software/dosfstools"
-##fpkg       ${CVS} "ftp://ftp.gnu.org/non-gnu/cvs/source/stable/$(get_pkg_ver ${CVS})"
-fpkg       ${GIT}          "http://www.kernel.org/pub/software/scm/git"
-fpkg       ${GIT_MANPAGES} "http://www.kernel.org/pub/software/scm/git"
+fpkg -m gnu ${PARTED}
+fpkg -m gnu ${ED}
+fpkg -m gnu ${BC}
+fpkg -m sf ${FUSE}
+fpkg ${DOSFSTOOLS} "http://www.daniel-baumann.ch/software/dosfstools"
+fpkg -s "pub/software/scm/git" ${GIT} ${KERNEL_URL}
+fpkg -s "software/scm/git" ${GIT_MANPAGES} ${KERNEL_URL}
 
 # Perl modules
-fpkg_sf    ${PERL_MOD_PDL} pdl
-fpkg       ${PERL_MOD_XML_WRITER} "http://www.cpan.org/modules/by-module/XML"
-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})"
-
-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"
-fpkg_sf    ${OPENJADE}
-fpkg_hv    ${SGML_SPM} # For re-generating fontconfig documentation.
-fpkg_sf    ${DOCBOOK_DSSSL} "docbook"
-fpkg       ${DOCBOOK_UTILS} "http://sources-redhat.mirrors.redwire.net/docbook-tools/new-trials/SOURCES"
-fpkg       ${LIBXML2} "http://xmlsoft.org/sources"
-fpkg       ${LIBXSLT} "http://xmlsoft.org/sources"
-fpkg_hv    ${DOCBOOK_XML}
-fpkg_sf    ${DOCBOOK_XSL} "docbook"
-fpkg_sf    ${XMLTOMAN}
-fpkg       ${XMLTO} "https://fedorahosted.org/releases/x/m/xmlto"
-
-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}
-fpkg       ${FRIBIDI} "http://fribidi.org/download"
-fpkg       ${HICOLOR_ICON_THEME} "http://icon-theme.freedesktop.org/releases"
-fpkg       ${TIFF} "http://download.osgeo.org/libtiff"
-fpkg_sf    ${GIFLIB}
-fpkg       ${LCMS}    "http://www.littlecms.com"
-fpkg_sf    ${LIBMNG}
-
-fpkg_sf    ${FREETYPE}
-fpkg       ${FONTCONFIG} "http://fontconfig.org/release"
+fpkg -m sf -s "pdl" ${PERL_MOD_PDL}
+fpkg -m pm -s "J/JO/JOSEPHW" ${PERL_MOD_XML_WRITER}
+fpkg -m pm -s "C/CH/CHORNY"  ${PERL_MOD_XML_PARSER}
+
+fpkg -m gnome ${INTLTOOL}
+fpkg ${PYTHON} "http://www.python.org/ftp/python/$(get_pkg_ver ${PYTHON})"
+
+fpkg -e "tgz" ${SGML_COMMON} \
+    "http://gd.tuwien.ac.at/hci/kde/devel/docbook/SOURCES"
+fpkg -m  hv ${SGML_DTD3}
+fpkg -m  hv ${SGML_DTD4}
+fpkg -m sf -s "openjade" ${OPENSP}
+fpkg -m sf ${OPENJADE}
+fpkg -m hv ${SGML_SPM}
+fpkg -m sf -s "docbook" ${DOCBOOK_DSSSL}
+fpkg -e "tar.gz" ${DOCBOOK_UTILS} \
+    "http://sources-redhat.mirrors.redwire.net/docbook-tools/new-trials/SOURCES"
+fpkg -e "tar.gz" ${LIBXML2} "http://xmlsoft.org/sources"
+fpkg -e "tar.gz" ${LIBXSLT} "http://xmlsoft.org/sources"
+fpkg -m hv ${DOCBOOK_XML}
+fpkg -m sf -s "docbook" ${DOCBOOK_XSL}
+fpkg -m sf ${XMLTOMAN}
+fpkg ${XMLTO} "https://fedorahosted.org/releases/x/m/xmlto"
+
+fpkg -f "jpegsrc.v$(get_pkg_ver ${LIBJPEG})" -e "tar.gz" ${LIBJPEG} \
+    "http://www.ijg.org/files"
+fpkg -f "openjpeg_v$(get_pkg_ver ${LIBOPENJPEG} | sed 's!\.!_!g')" \
+    ${LIBOPENJPEG} "http://www.openjpeg.org"
+fpkg -m sf ${LIBPNG}
+fpkg -m gnome ${LIBART}
+fpkg -m sf ${LIBEXIF}
+fpkg -e "tar.gz" ${FRIBIDI} "http://fribidi.org/download"
+fpkg -m fd -o "icon-theme" ${HICOLOR_ICON_THEME}
+fpkg ${TIFF} "http://download.osgeo.org/libtiff"
+fpkg -m sf ${GIFLIB}
+fpkg -m sf ${LCMS}
+
+fpkg -m sf ${LIBMNG}
+
+fpkg -m sf ${FREETYPE}
+fpkg -e "tar.gz" ${FONTCONFIG} "http://fontconfig.org/release"
 
 exit $?