Remplacé echo par msg_log

[hvlinux.git] / stage2 / packages-update

diff --git a/stage2/packages-update b/stage2/packages-update
index bfe5154..1e7f1d2 100755 (executable)
--- 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}
@@ -66,10 +64,17 @@ 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"
-fpkg ${B43_FWCUTTER} "http://bu3sch.de/b43/fwcutter"
+
+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"
@@ -78,8 +83,9 @@ 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 -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 $?