Harmonisé les noms des différentes fonctions get_pkg_ver...

[hvlinux.git] / stage2 / packages-update

diff --git a/stage2/packages-update b/stage2/packages-update
index 479ffb8..0ef7037 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}
@@ -72,7 +70,7 @@ if [ -n "${WIFI_SUPPORT}" ]; then
         "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux"
     fpkg -e "tar.gz" ${WPA_SUPPLICANT} "http://hostap.epitest.fi/releases"
 
-    if [ -n "${FIRMWARE_B43_LPPHY}" ]; then
+    if [ -n "${B43_LPPHY}" ]; then
         fpkg ${B43_FWCUTTER} "http://bu3sch.de/b43/fwcutter"
         fpkg ${FIRMWARE_B43_LPPHY} "http://downloads.openwrt.org/sources"
     fi