Add option to append version number in fpkg()

[hvlinux.git] / stage2 / packages-update

diff --git a/stage2/packages-update b/stage2/packages-update
index a2582fb..d12ec7f 100755 (executable)
--- a/stage2/packages-update
+++ b/stage2/packages-update
@@ -1,29 +1,23 @@
 #!/bin/bash
 
-USE_LFS_PATCHES=1
-USE_LFS_OLD_PATCHES=1
-USE_BLFS_PATCHES=1
-USE_CLFS_PATCHES=1
-USE_HV_PATCHES=1
-
 source ../functions/main
 
 update_packages_init ${*}
 
 # These packages were already downloaded for stage0:
 lpkg 0 ${KERNEL}
-lpkg 0 ${EGLIBC}
+lpkg 0 ${GLIBC}
 lpkg 0 ${GMP}
 lpkg 0 ${MPFR}
 lpkg 0 ${MPC}
-lpkg 0 ${PPL}
+lpkg 0 ${ISL}
 lpkg 0 ${CLOOG}
 lpkg 0 ${BINUTILS}
 lpkg 0 ${GCC}
-lpkg 0 ${NCURSES}
-lpkg 0 ${FILE_PKG}
 
 # These packages were already downloaded for stage1:
+lpkg 1 ${NCURSES}
+lpkg 1 ${FILE_PKG}
 lpkg 1 ${NANO}
 lpkg 1 ${ZLIB}
 lpkg 1 ${SED}
@@ -52,12 +46,14 @@ lpkg 1 ${EUDEV}
 lpkg 1 ${XZ_UTILS}
 
 # These packages are only for stage2
+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 ${PYTHON} "http://www.python.org/ftp/python/$(get_pkg_ver ${PYTHON})"
+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"
@@ -94,11 +90,14 @@ fpkg -m sf ${PSMISC}
 fpkg -e "tar.gz" ${SYSKLOGD} \
     "http://www.infodrom.org/projects/sysklogd/download"
 fpkg -m gnu ${GRUB}
-fpkg -e "tar.gz" ${DHCP} "ftp://ftp.isc.org/isc/dhcp/$(get_pkg_ver ${DHCP})"
+fpkg -e "tar.gz" -v 0 ${DHCP} "ftp://ftp.isc.org/isc/dhcp"
+fpkg ${DHCPCD} "http://roy.marples.name/downloads/dhcpcd"
 
 fpkg -e "tar.gz" ${ACPID} "http://www.tedfelix.com/linux"
 fpkg -m hv ${HV_UTILITIES}
-fpkg -e "tgz" ${ICU} "http://download.icu-project.org/files/icu4c/49.1.2"
+fpkg -e "tgz" -f "${ICU}-src" -s "$(get_pkg_ver_underscore2 ${ICU})" ${ICU} \
+    "http://download.icu-project.org/files/icu4c"
+
 fpkg -m sf ${GPTFDISK}
 
 fpkg -e "tar.gz" ${LZO}  "http://www.oberhumer.com/opensource/lzo/download"