Add option to append version number in fpkg()

[hvlinux.git] / stage1 / packages-update

diff --git a/stage1/packages-update b/stage1/packages-update
index f8e3ffe..e897949 100755 (executable)
--- a/stage1/packages-update
+++ b/stage1/packages-update
@@ -1,9 +1,5 @@
 #!/bin/bash
 
-USE_LFS_PATCHES=1
-USE_BLFS_PATCHES=1
-USE_CLFS_PATCHES=1
-
 source ../functions/main
 
 update_packages_init ${*}
@@ -16,15 +12,15 @@ lpkg 0 ${ISL}
 lpkg 0 ${CLOOG}
 lpkg 0 ${BINUTILS}
 lpkg 0 ${GCC}
-lpkg 0 ${NCURSES}
-lpkg 0 ${FILE_PKG}
 lpkg 0 ${KERNEL}
 
 # New packages for stage 1:
+fpkg -e "tar.gz" ${FILE_PKG} "ftp://ftp.astron.com/pub/file"
+fpkg -m gnu ${NCURSES}
 fpkg ${ZLIB} "http://www.zlib.net"
 fpkg -m gnu ${BASH}
 fpkg -m gnu ${BISON}
-fpkg -e "tar.gz" ${BZIP2} "http://www.bzip.org/$(get_pkg_ver ${BZIP2})"
+fpkg -e "tar.gz" -v 0 ${BZIP2} "http://www.bzip.org"
 fpkg -m gnu -e "tar.xz" ${COREUTILS}
 fpkg -m gnu ${DIFFUTILS}
 fpkg -m gnu ${FINDUTILS}
@@ -43,8 +39,7 @@ fpkg -m gnu ${NANO}
 fpkg ${XZ_UTILS} "http://tukaani.org/xz"
 
 # Chapter 7
-fpkg -s "linux/utils/util-linux/v$(get_pkg_ver2 ${UTIL_LINUX})" \
-    ${UTIL_LINUX} ${KERNEL_URL}
+fpkg -s "linux/utils/util-linux/v" -v 2 ${UTIL_LINUX} ${KERNEL_URL}
 fpkg -m hv ${SHADOW}
 fpkg -m sf ${E2FSPROGS}
 fpkg ${SYSVINIT} "http://download.savannah.gnu.org/releases/sysvinit"