Stage2 semble compléter ok

[hvlinux.git] / stage2 / packages-update

diff --git a/stage2/packages-update b/stage2/packages-update
index 4579102..fd191a2 100755 (executable)
--- a/stage2/packages-update
+++ b/stage2/packages-update
@@ -1,8 +1,8 @@
-#!/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.
@@ -13,89 +13,70 @@ source ../packages-list
 
 update_packages_init
 
-# Begin
+if [ ${#} -eq 1 -a "x${1}" = "xtest" ]; then
+    export TEST_INTEGRITY=1
+fi
 
-# These packages are needed first for stage1:
-lpkg     1 ${BINUTILS}
-lpkg     1 ${GCC_CORE}
-lpkg     1 ${KERNEL}
-lpkg     1 ${GLIBC}
+# 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}
+
+# 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 ${COREUTILS}
 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 ${SED}
+lpkg     1 ${SYSVINIT}
 lpkg     1 ${TAR_PACKAGE}
 lpkg     1 ${TEXINFO}
-lpkg     1 ${UTIL_LINUX}
+lpkg     1 ${UDEV}
+lpkg     1 ${XZ_UTILS}
 
 # 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       ${DB4} http://download.oracle.com/berkeley-db
-fpkg_sf    ${E2FSPROGS}
+fpkg       ${PKG_CONFIG} http://pkgconfig.freedesktop.org/releases
 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   ${LIBTOOL}
+fpkg_gnu   ${GDBM}
+fpkg_gnu   ${INETUTILS}
 fpkg_gnu   ${AUTOCONF}
 fpkg_gnu   ${AUTOMAKE}
-
-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       ${IPROUTE2} http://devresources.linux-foundation.org/dev/iproute2/download
 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       ${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       ${SYSVINIT} ftp://ftp.cistron.nl/pub/people/miquels/sysvinit
-fpkg       ${UDEV} http://www.kernel.org/pub/linux/utils/kernel/hotplug
-fpkg       ${UDEV_CONFIG} "http://www.linuxfromscratch.org/lfs/downloads/development"
-
-# 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_gnu   ${WGET}
-fpkg       ${PCIUTILS} ftp://ftp.kernel.org/pub/software/utils/pciutils
-
-fpkg_lfs   ${LFS_BOOTSCRIPTS}
+fpkg       ${UDEV_CONFIG} http://www.linuxfromscratch.org/lfs/downloads/development
+fpkg       ${GRUB} ftp://alpha.gnu.org/gnu/grub
 
-# Return last error
 exit $?