X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage2%2Fpackages-update;h=6a3742435812b2ab83ab3d1d43479169b3b7fe39;hb=0fbeb62f20d44b9452cd286fe5bacb7e329fc2f6;hp=b12affe8c30d9b946c1e448a6bfea6b3f343d09c;hpb=f3c8db3027d5dc530e1f30c88e0235975211582e;p=hvlinux.git

diff --git a/stage2/packages-update b/stage2/packages-update
index b12affe..6a37424 100755
--- a/stage2/packages-update
+++ b/stage2/packages-update
@@ -19,15 +19,14 @@ lpkg 0 ${PPL}
 lpkg 0 ${CLOOG_PPL}
 lpkg 0 ${BINUTILS}
 lpkg 0 ${GCC}
+lpkg 0 ${NCURSES}
+lpkg 0 ${FILE_PKG}
 
 # These packages were already downloaded for stage1:
 lpkg 1 ${NANO}
-
-# These packages were already downloaded for stage1:
 lpkg 1 ${ZLIB}
 lpkg 1 ${SED}
-lpkg 1 ${NCURSES}
-lpkg 1 ${UTIL_LINUX_NG}
+lpkg 1 ${UTIL_LINUX}
 lpkg 1 ${E2FSPROGS}
 lpkg 1 ${COREUTILS}
 lpkg 1 ${MFOUR}
@@ -36,7 +35,6 @@ lpkg 1 ${FLEX}
 lpkg 1 ${BASH}
 lpkg 1 ${BZIP2}
 lpkg 1 ${DIFFUTILS}
-lpkg 1 ${FILE_PKG}
 lpkg 1 ${FINDUTILS}
 lpkg 1 ${GAWK}
 lpkg 1 ${GETTEXT}
@@ -53,7 +51,9 @@ lpkg 1 ${XZ_UTILS}
 
 # These packages are only for stage2
 fpkg -e "tar.gz" ${PERL} "http://www.cpan.org/src/5.0"
-fpkg -s "linux/docs/manpages" ${MANPAGES} ${KERNEL_URL}
+fpkg -s "manpages" ${MANPAGES} "http://tldp.org"
+
+fpkg -m gnome ${GLIB}
 fpkg -m fd ${PKG_CONFIG}
 fpkg ${IANA} "http://www.sethwklein.net"
 fpkg -e "tar.gz" ${PROCPS} "http://procps.sourceforge.net"
@@ -66,19 +66,30 @@ fpkg -m gnu ${AUTOMAKE}
 fpkg -m gnu ${GROFF}
 fpkg ${IPROUTE2} \
     "http://devresources.linux-foundation.org/dev/iproute2/download"
-fpkg -e "tar.gz" ${WIRELESS_TOOLS} \
-    "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux"
-fpkg -e "tar.gz" ${WPA_SUPPLICANT} "http://hostap.epitest.fi/releases"
+
+if [ -n "${WIFI_SUPPORT}" ]; then
+    fpkg -e "tar.gz" ${WIRELESS_TOOLS} \
+        "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux"
+    fpkg -e "tar.gz" ${WPA_SUPPLICANT} "http://hostap.epitest.fi/releases"
+
+    if [ -n "${B43_LPPHY}" ]; then
+        fpkg ${B43_FWCUTTER} "http://bu3sch.de/b43/fwcutter"
+        fpkg ${FIRMWARE_B43_LPPHY} "http://downloads.openwrt.org/sources"
+    fi
+fi
 
 fpkg -s "linux/utils/kbd" ${KBD} ${KERNEL_URL}
 fpkg -e "tar.gz" ${LESS} "http://www.greenwoodsoftware.com/less"
+fpkg -e "tar.gz" -s "libpipeline" ${LIBPIPELINE} \
+    "http://download.savannah.gnu.org/releases"
 fpkg -e "tar.gz" ${MAN_DB} "http://download.savannah.gnu.org/releases/man-db"
 fpkg -m sf ${PSMISC}
 fpkg -m hv ${SHADOW}
 fpkg -e "tar.gz" ${SYSKLOGD} \
     "http://www.infodrom.org/projects/sysklogd/download"
-fpkg ${UDEV_CONFIG} "http://www.linuxfromscratch.org/lfs/downloads/development"
-fpkg -e "tar.gz" ${GRUB} "ftp://alpha.gnu.org/gnu/grub"
+fpkg -m gnu ${GRUB}
 fpkg -e "tar.gz" ${DHCP} "ftp://ftp.isc.org/isc/dhcp/dhcp-3.0-history"
 
+fpkg -e "tar.gz" ${ACPID} "http://www.tedfelix.com/linux"
+
 exit $?