Merge branche make

[hvlinux.git] / stage2 / packages-update

diff --git a/stage2/packages-update b/stage2/packages-update
index 4eb36ca..501dad4 100755 (executable)
--- a/stage2/packages-update
+++ b/stage2/packages-update
@@ -1,28 +1,35 @@
-#!/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 ../config/sysinfos
 source ../functions
-source ../functions-update
-source ../packages-list
+source ../functions-fpkg
+source ../config/packages-list
 
 update_packages_init
 
+if [ ${#} -eq 1 -a "x${1}" = "xtest" ]; then
+    export TEST_INTEGRITY=1
+fi
+
 # These packages were already downloaded for stage0:
 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_CORE}
+lpkg     0 ${GCC}
+
+# These packages were already downloaded for stage1:
+lpkg     1 ${NANO}
 
 # These packages were already downloaded for stage1:
 lpkg     1 ${ZLIB}
@@ -51,10 +58,9 @@ lpkg     1 ${TAR_PACKAGE}
 lpkg     1 ${TEXINFO}
 lpkg     1 ${UDEV}
 lpkg     1 ${XZ_UTILS}
-lpkg     1 ${NANO}
 
 # These packages are only for stage2
-fpkg       ${PERL} http://ftp.funet.fi/pub/CPAN/src
+fpkg -e tar.gz ${PERL} http://www.cpan.org/src/5.0
 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
@@ -75,30 +81,6 @@ 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
-
-# Additional packages (not in original LFS, only for hvlinux).
-fpkg_gnu   ${EMACS}
-fpkg_gnu   ${WHICH}
-fpkg       ${REISERFSPROGS} http://www.kernel.org/pub/linux/utils/fs/reiserfs
-fpkg       ${PCIUTILS} ftp://ftp.kernel.org/pub/software/utils/pciutils
-fpkg       ${NET_TOOLS} http://www.tazenda.demon.co.uk/phil/net-tools
 fpkg       ${DHCP} ftp://ftp.isc.org/isc/dhcp/dhcp-3.0-history
-fpkg       ${POPT} http://rpm5.org/files/popt
-fpkg       ${PAM} http://www.kernel.org/pub/linux/libs/pam/library
-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_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}
-fpkg       ${SQLITE} http://www.sqlite.org
-fpkg       ${SUBVERSION} http://subversion.tigris.org/downloads
-fpkg       ${SUDO} http://www.sudo.ws/sudo/dist
-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
 
 exit $?