X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage1%2Fpackages-update;h=a8fcee99372bfbd2e00728baa7cb762241821532;hb=9252b914495c96a2b323f1dbec5fa075a280c380;hp=dfae25499a7240fbb5e8afbac773a44d4b41925b;hpb=f3c8db3027d5dc530e1f30c88e0235975211582e;p=hvlinux.git

diff --git a/stage1/packages-update b/stage1/packages-update
index dfae254..a8fcee9 100755
--- a/stage1/packages-update
+++ b/stage1/packages-update
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+USE_LFS_PATCHES=1
+USE_BLFS_PATCHES=1
 USE_CLFS_PATCHES=1
 USE_HV_PATCHES=1
 
@@ -21,16 +23,20 @@ lpkg 0 ${KERNEL}
 
 # New packages for stage 1:
 fpkg ${ZLIB} "http://www.zlib.net"
+
+unset USE_CLFS_PATCHES
 fpkg -m gnu ${BASH}
+USE_CLFS_PATCHES=1
+
 fpkg -m gnu ${BISON}
-fpkg ${BZIP2} "http://www.bzip.org/$(get_pkg_ver ${BZIP2})"
-fpkg -m gnu ${COREUTILS}
+fpkg -e "tar.gz" ${BZIP2} "http://www.bzip.org/$(get_pkg_ver ${BZIP2})"
+fpkg -m gnu -e "tar.xz" ${COREUTILS}
 fpkg -m gnu ${DIFFUTILS}
 fpkg -m gnu ${FINDUTILS}
 fpkg -m sf ${FLEX}
 fpkg -m gnu ${GAWK}
 fpkg -m gnu ${GETTEXT}
-fpkg -m gnu ${GREP}
+fpkg -m gnu -e "tar.xz" ${GREP}
 fpkg -m gnu ${GZIP}
 fpkg -m gnu ${MFOUR}
 fpkg -m gnu ${MAKE_PACKAGE}
@@ -42,10 +48,10 @@ fpkg -m gnu ${NANO}
 fpkg ${XZ_UTILS} "http://tukaani.org/xz"
 
 # Chapter 7
-fpkg -s "linux/utils/util-linux-ng/v$(get_pkg_ver_base ${UTIL_LINUX_NG})" \
-    ${UTIL_LINUX_NG} ${KERNEL_URL}
+fpkg -s "linux/utils/util-linux/v$(get_pkg_ver2 ${UTIL_LINUX})" \
+    ${UTIL_LINUX} ${KERNEL_URL}
 fpkg -m sf ${E2FSPROGS}
-fpkg ${SYSVINIT} "ftp://ftp.cistron.nl/pub/people/miquels/sysvinit"
+fpkg ${SYSVINIT} "http://download.savannah.gnu.org/releases/sysvinit"
 fpkg -s "linux/utils/kernel/module-init-tools" ${MODULE_INIT_TOOLS} \
     ${KERNEL_URL}
 fpkg -s "linux/utils/kernel/hotplug" ${UDEV} ${KERNEL_URL}