X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage2%2Fpackages-update;h=bfe515432ddcabada9f1cfe0ab8226f98b5315be;hb=a348576b5f215c87cf471d4340713e0773f4edf8;hp=d1a1f37f8d311f659d6b2dd7359d1e8996054611;hpb=d7900cf1804af891098cd22b0ff32aee9df51969;p=hvlinux.git

diff --git a/stage2/packages-update b/stage2/packages-update
index d1a1f37..bfe5154 100755
--- a/stage2/packages-update
+++ b/stage2/packages-update
@@ -1,82 +1,85 @@
-#!/bin/sh
+#!/bin/bash
 
-LFS_STAGE="stage2"
 USE_LFS_PATCHES=1
 USE_BLFS_PATCHES=1
 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
-
-if [ ${#} -eq 1 -a "x${1}" = "xtest" ]; then
-    export TEST_INTEGRITY=1
-fi
+update_packages_init ${*}
 
 # These packages were already downloaded for stage0:
-lpkg     0 ${KERNEL}
-lpkg     0 ${EGLIBC}
-lpkg     0 ${GMP}
-lpkg     0 ${MPFR}
-lpkg     0 ${PPL}
-lpkg     0 ${CLOOG_PPL}
-lpkg     0 ${BINUTILS}
-lpkg     0 ${GCC_CORE}
+lpkg 0 ${KERNEL}
+lpkg 0 ${EGLIBC}
+lpkg 0 ${GMP}
+lpkg 0 ${MPFR}
+lpkg 0 ${MPC}
+lpkg 0 ${PPL}
+lpkg 0 ${CLOOG_PPL}
+lpkg 0 ${BINUTILS}
+lpkg 0 ${GCC}
+
+# These packages were already downloaded for stage1:
+lpkg 1 ${NANO}
 
 # These packages were already downloaded for stage1:
-lpkg     1 ${ZLIB}
-lpkg     1 ${SED}
-lpkg     1 ${NCURSES}
-lpkg     1 ${UTIL_LINUX_NG}
-lpkg     1 ${E2FSPROGS}
-lpkg     1 ${COREUTILS}
-lpkg     1 ${MFOUR}
-lpkg     1 ${BISON}
-lpkg     1 ${FLEX}
-lpkg     1 ${BASH}
-lpkg     1 ${BZIP2}
-lpkg     1 ${DIFFUTILS}
-lpkg     1 ${FILE_PKG}
-lpkg     1 ${FINDUTILS}
-lpkg     1 ${GAWK}
-lpkg     1 ${GETTEXT}
-lpkg     1 ${GREP}
-lpkg     1 ${GZIP}
-lpkg     1 ${MAKE_PACKAGE}
-lpkg     1 ${MODULE_INIT_TOOLS}
-lpkg     1 ${PATCH_PACKAGE}
-lpkg     1 ${SYSVINIT}
-lpkg     1 ${TAR_PACKAGE}
-lpkg     1 ${TEXINFO}
-lpkg     1 ${UDEV}
-lpkg     1 ${XZ_UTILS}
+lpkg 1 ${ZLIB}
+lpkg 1 ${SED}
+lpkg 1 ${NCURSES}
+lpkg 1 ${UTIL_LINUX_NG}
+lpkg 1 ${E2FSPROGS}
+lpkg 1 ${COREUTILS}
+lpkg 1 ${MFOUR}
+lpkg 1 ${BISON}
+lpkg 1 ${FLEX}
+lpkg 1 ${BASH}
+lpkg 1 ${BZIP2}
+lpkg 1 ${DIFFUTILS}
+lpkg 1 ${FILE_PKG}
+lpkg 1 ${FINDUTILS}
+lpkg 1 ${GAWK}
+lpkg 1 ${GETTEXT}
+lpkg 1 ${GREP}
+lpkg 1 ${GZIP}
+lpkg 1 ${MAKE_PACKAGE}
+lpkg 1 ${MODULE_INIT_TOOLS}
+lpkg 1 ${PATCH_PACKAGE}
+lpkg 1 ${SYSVINIT}
+lpkg 1 ${TAR_PACKAGE}
+lpkg 1 ${TEXINFO}
+lpkg 1 ${UDEV}
+lpkg 1 ${XZ_UTILS}
 
 # These packages are only for stage2
-fpkg       ${PERL} http://ftp.funet.fi/pub/CPAN/src
-fpkg       ${MANPAGES} http://www.kernel.org/pub/linux/docs/manpages
-fpkg       ${PKG_CONFIG} http://pkgconfig.freedesktop.org/releases
-fpkg       ${IANA} http://www.sethwklein.net/projects/iana-etc/downloads
-fpkg       ${PROCPS} http://procps.sourceforge.net
-fpkg_gnu   ${READLINE}
-fpkg_gnu   ${LIBTOOL}
-fpkg_gnu   ${GDBM}
-fpkg_gnu   ${INETUTILS}
-fpkg_gnu   ${AUTOCONF}
-fpkg_gnu   ${AUTOMAKE}
-fpkg_gnu   ${GROFF}
-fpkg       ${IPROUTE2} http://devresources.linux-foundation.org/dev/iproute2/download
-fpkg       ${KBD} http://www.kernel.org/pub/linux/utils/kbd
-fpkg       ${LESS} http://www.greenwoodsoftware.com/less
-fpkg       ${MAN_DB} http://download.savannah.gnu.org/releases/man-db
-fpkg_sf    ${PSMISC}
-fpkg_hv    ${SHADOW}
-fpkg       ${SYSKLOGD} http://www.infodrom.org/projects/sysklogd/download
-fpkg       ${UDEV_CONFIG} http://www.linuxfromscratch.org/lfs/downloads/development
-fpkg       ${GRUB} ftp://alpha.gnu.org/gnu/grub
+fpkg -e "tar.gz" ${PERL} "http://www.cpan.org/src/5.0"
+fpkg -s "linux/docs/manpages" ${MANPAGES} ${KERNEL_URL}
+fpkg -m fd ${PKG_CONFIG}
+fpkg ${IANA} "http://www.sethwklein.net"
+fpkg -e "tar.gz" ${PROCPS} "http://procps.sourceforge.net"
+fpkg -m gnu ${READLINE}
+fpkg -m gnu ${LIBTOOL}
+fpkg -m gnu ${GDBM}
+fpkg -m gnu ${INETUTILS}
+fpkg -m gnu ${AUTOCONF}
+fpkg -m gnu ${AUTOMAKE}
+fpkg -m gnu ${GROFF}
+fpkg ${IPROUTE2} \
+    "http://devresources.linux-foundation.org/dev/iproute2/download"
+fpkg -e "tar.gz" ${WIRELESS_TOOLS} \
+    "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux"
+fpkg -e "tar.gz" ${WPA_SUPPLICANT} "http://hostap.epitest.fi/releases"
+fpkg ${B43_FWCUTTER} "http://bu3sch.de/b43/fwcutter"
+
+fpkg -s "linux/utils/kbd" ${KBD} ${KERNEL_URL}
+fpkg -e "tar.gz" ${LESS} "http://www.greenwoodsoftware.com/less"
+fpkg -e "tar.gz" ${MAN_DB} "http://download.savannah.gnu.org/releases/man-db"
+fpkg -m sf ${PSMISC}
+fpkg -m hv ${SHADOW}
+fpkg -e "tar.gz" ${SYSKLOGD} \
+    "http://www.infodrom.org/projects/sysklogd/download"
+fpkg ${UDEV_CONFIG} "http://www.linuxfromscratch.org/lfs/downloads/development"
+fpkg -e "tar.gz" ${GRUB} "ftp://alpha.gnu.org/gnu/grub"
+fpkg -e "tar.gz" ${DHCP} "ftp://ftp.isc.org/isc/dhcp/dhcp-3.0-history"
 
 exit $?