X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage2%2Fpackages-update;h=f9d10beaa8f5bfc7730372a05038e9ce842869c6;hb=2d56e369dbc033f743dfcc0b392c844d6299937b;hp=b4d4da16d513ab92520bd8180996405fd822fbf9;hpb=b2f91df3e7c1d1ca93ced97b5001e3134243666b;p=hvlinux.git

diff --git a/stage2/packages-update b/stage2/packages-update
index b4d4da1..f9d10be 100755
--- a/stage2/packages-update
+++ b/stage2/packages-update
@@ -1,98 +1,106 @@
-#!/bin/sh
+#!/bin/bash
 
-LFS_STAGE="stage2"
+source ../functions/main
 
-# Reading system configuration informations, functions and package versions.
-source ../sysinfos
-source ../functions
-source ../functions-update
-source ../packages-list
+update_packages_init ${*}
 
-update_packages_init
+# These packages were already downloaded for stage0:
+lpkg 0 ${KERNEL}
+lpkg 0 ${GLIBC}
+lpkg 0 ${GMP}
+lpkg 0 ${MPFR}
+lpkg 0 ${MPC}
+lpkg 0 ${ISL}
+lpkg 0 ${CLOOG}
+lpkg 0 ${BINUTILS}
+lpkg 0 ${GCC}
 
-# Begin
-
-# These packages are needed first for stage1:
-lpkg     1 ${BINUTILS}
-lpkg     1 ${GCC_CORE}
-lpkg     1 ${KERNEL}
-lpkg     1 ${GLIBC}
-lpkg     1 ${NCURSES}
-lpkg     1 ${BASH}
-lpkg     1 ${BZIP2}
-lpkg     1 ${COREUTILS}
-lpkg     1 ${DIFFUTILS}
-lpkg     1 ${FINDUTILS}
-lpkg     1 ${GAWK}
-lpkg     1 ${GETTEXT}
-lpkg     1 ${GREP}
-lpkg     1 ${GZIP}
-lpkg     1 ${MAKE_PACKAGE}
-lpkg     1 ${PATCH_PACKAGE}
-lpkg     1 ${SED}
-lpkg     1 ${TAR_PACKAGE}
-lpkg     1 ${TEXINFO}
-lpkg     1 ${UTIL_LINUX}
+# These packages were already downloaded for stage1:
+lpkg 1 ${NCURSES}
+lpkg 1 ${FILE_PKG}
+lpkg 1 ${NANO}
+lpkg 1 ${ZLIB}
+lpkg 1 ${SED}
+lpkg 1 ${UTIL_LINUX}
+lpkg 1 ${SHADOW}
+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 ${FINDUTILS}
+lpkg 1 ${GAWK}
+lpkg 1 ${GETTEXT}
+lpkg 1 ${GREP}
+lpkg 1 ${GZIP}
+lpkg 1 ${MAKE_PACKAGE}
+lpkg 1 ${KMOD}
+lpkg 1 ${PATCH_PACKAGE}
+lpkg 1 ${SYSVINIT}
+lpkg 1 ${TAR_PACKAGE}
+lpkg 1 ${TEXINFO}
+lpkg 1 ${EUDEV}
+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       ${DB4} http://download.oracle.com/berkeley-db
-fpkg_sf    ${E2FSPROGS}
-fpkg       ${IANA} http://www.sethwklein.net/projects/iana-etc/downloads
-fpkg_gnu   ${MFOUR}
-fpkg_gnu   ${BISON}
-fpkg       ${PROCPS} http://procps.sourceforge.net
-fpkg_gnu   ${LIBTOOL}
-fpkg_gnu   ${READLINE}
-fpkg       ${ZLIB} http://www.zlib.net
-fpkg_gnu   ${AUTOCONF}
-fpkg_gnu   ${AUTOMAKE}
+fpkg -e "tar.gz" ${TZDATA} \
+    "http://www.iana.org/time-zones/repository/releases"
+fpkg -e "tar.bz2" ${BC} "http://alpha.gnu.org/gnu/bc"
+fpkg -e "tar.gz" ${PERL} "http://www.cpan.org/src/5.0"
+fpkg -s "manpages" ${MANPAGES} "http://tldp.org"
+fpkg -m gnu -e "tar.gz" ${GPERF}
+fpkg -e "tar.gz" ${LIBFFI} "ftp://sourceware.org/pub/libffi"
+fpkg -v 0 ${PYTHON} "http://www.python.org/ftp/python"
+fpkg -m gnome ${GLIB}
+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 -s "linux/utils/net/iproute2" ${IPROUTE2} ${KERNEL_URL}
+
+if [ -n "${WIFI_SUPPORT}" ]; then
+    fpkg -e "tar.gz" ${LIBNL} \
+        "http://www.infradead.org/~tgr/libnl/files"
+    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"
+
+    if [ -n "${B43_LPPHY}" ]; then
+        fpkg ${B43_FWCUTTER} "http://bues.ch/b43/fwcutter"
+        fpkg ${FIRMWARE_B43_LPPHY} "http://www.lwfinger.com/b43-firmware"
+    fi
+fi
+
+fpkg -e "tar.gz" ${KBD} "http://ftp.altlinux.org/pub/people/legion/kbd"
+fpkg -e "tar.gz" ${LESS} "http://www.greenwoodsoftware.com/less"
+fpkg -e "tar.gz" -s "libpipeline" ${LIBPIPELINE} \
+    "http://download.savannah.gnu.org/releases"
+fpkg -e "tar.gz" ${MAN_DB} "http://download.savannah.gnu.org/releases/man-db"
+fpkg -m sf ${PSMISC}
 
-fpkg       ${LESS} http://www.greenwoodsoftware.com/less
-fpkg_gnu   ${GROFF}
-fpkg_sf    ${FLEX}
-fpkg_gnu   ${INETUTILS}
-fpkg_hv    ${IPROUTE2}
-fpkg       ${FILE_PKG} "ftp://ftp.gw.com/mirrors/unix/file/"
-fpkg       ${KBD} http://www.kernel.org/pub/linux/utils/kbd
-fpkg       ${GRUB} ftp://alpha.gnu.org/gnu/grub
-fpkg       ${MAN} http://primates.ximian.com/~flucifredi/man
-fpkg       ${MKTEMP} ftp://ftp.mktemp.org/pub/mktemp
-fpkg       ${MODULE_INIT_TOOLS} http://www.kernel.org/pub/linux/utils/kernel/module-init-tools
-fpkg_sf    ${PSMISC}
-fpkg_hv    ${SHADOW}
-fpkg       ${SYSKLOGD} http://www.infodrom.org/projects/sysklogd/download
-fpkg       ${SYSVINIT} ftp://ftp.cistron.nl/pub/people/miquels/sysvinit
-fpkg       ${UDEV} http://www.kernel.org/pub/linux/utils/kernel/hotplug
-fpkg_lfs   ${UDEV_CONFIG}
+fpkg -e "tar.gz" ${SYSKLOGD} \
+    "http://www.infodrom.org/projects/sysklogd/download"
+fpkg -m gnu ${GRUB}
+fpkg -e "tar.gz" -v 0 ${DHCP} "ftp://ftp.isc.org/isc/dhcp"
+fpkg ${DHCPCD} "http://roy.marples.name/downloads/dhcpcd"
 
-# Additional packages (not in original LFS, only for hvlinux).
-fpkg       ${NANO} http://www.nano-editor.org/dist/v2.0
-fpkg_hv    ${REISERFSPROGS}
-fpkg       ${PAM} http://www.kernel.org/pub/linux/libs/pam/pre/library
-fpkg       ${OPENSSL} ftp://ftp.openssl.org/source
-fpkg       ${OPENSSH} ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable
-fpkg       ${DHCP} ftp://ftp.isc.org/isc/dhcp/dhcp-3.0-history
-fpkg       ${NFS_UTILS} ftp://ftp.kernel.org/pub/linux/utils/nfs
-fpkg_gnu   ${WHICH}
-fpkg       ${TCPWRAPPERS} ftp://ftp.porcupine.org/pub/security
-fpkg       ${APR}      http://apache.sunsite.ualberta.ca/apr
-fpkg_sf    ${EXPAT}
-fpkg       ${APR_UTIL} http://apache.sunsite.ualberta.ca/apr
-fpkg       ${NEON}      http://www.webdav.org/neon
-fpkg       ${SUBVERSION} http://subversion.tigris.org/downloads
-fpkg       ${SUDO} http://www.courtesan.com/sudo/dist
-fpkg       ${PKG_CONFIG} http://pkgconfig.freedesktop.org/releases
-fpkg       ${NET_TOOLS} http://www.tazenda.demon.co.uk/phil/net-tools
-fpkg_hv    ${POPT}
-fpkg_hv    ${PORTMAP}
-fpkg_gnu   ${EMACS}
+fpkg -m sf ${ACPID}
+fpkg -m hv ${HV_UTILITIES}
+fpkg -e "tgz" -f "${ICU}-src" -s "$(get_pkg_ver_underscore2 ${ICU})" ${ICU} \
+    "http://download.icu-project.org/files/icu4c"
 
-fpkg_gnu   ${WGET}
-fpkg       ${PCIUTILS} ftp://ftp.kernel.org/pub/software/utils/pciutils
+fpkg -m sf ${GPTFDISK}
 
-fpkg_lfs   ${LFS_BOOTSCRIPTS}
+fpkg -e "tar.gz" ${LZO}  "http://www.oberhumer.com/opensource/lzo/download"
+fpkg -e "tar.gz" ${LZOP} "http://www.lzop.org/download"
 
-# Return last error
 exit $?