From: gobo72 <gobo72@364a67c3-989e-7be9-548d-dae8560ea662>
Date: Thu, 10 Mar 2011 05:44:53 +0000 (+0000)
Subject: Corrections mineures et vérification si wget est installé dans fpkg()
X-Git-Url: http://gitweb.hugovil.com/?a=commitdiff_plain;ds=inline;h=6be74141099e569e059115b9659f1a8c98306ac7;p=hvlinux.git

Corrections mineures et vérification si wget est installé dans fpkg()
---

diff --git a/functions/fpkg b/functions/fpkg
index 0fd60c5..cffb6f1 100644
--- a/functions/fpkg
+++ b/functions/fpkg
@@ -76,6 +76,11 @@ update_packages_init()
         return 0
     fi
 
+    if [ ! -x /usr/bin/wget ]; then
+	echo "${FUNCNAME}() error, the wget package was not found."
+	return 1
+    fi
+
     if [ -n "${USE_LFS_PATCHES}" ]; then
         # Getting list of all patches from LFS server.
         rcmd "Fetching LFS patches list" static_fetch_patches_list ${LFS_PATCHES_URL} ${LFS_PATCHES_LIST}
diff --git a/functions/ipkg b/functions/ipkg
index 23a1e1a..177f52c 100644
--- a/functions/ipkg
+++ b/functions/ipkg
@@ -151,12 +151,14 @@ ipkg_script()
             --cache-file=${LFS_TMP}/${PACKAGE}-build/config.cache"
     fi
 
-    # Add option --disable-dependency-tracking if supported
-    if cat ${LFS_TMP}/${PACKAGE}/configure | \
-        grep "disable-dependency-tracking" 1> /dev/null 2>&1; then
-        CONFIGURE_OPTS="\
-            ${CONFIGURE_OPTS} \
-            --disable-dependency-tracking"
+    if [ "x${IPKG_MODE}" != "xnoac" ]; then
+        # Add option --disable-dependency-tracking if supported
+        if cat ${LFS_TMP}/${PACKAGE}/configure | \
+            grep "disable-dependency-tracking" 1> /dev/null 2>&1; then
+            CONFIGURE_OPTS="\
+                ${CONFIGURE_OPTS} \
+                --disable-dependency-tracking"
+        fi
     fi
 
     ipkg_display_build_infos
diff --git a/functions/main b/functions/main
index c3c0e5d..d677cc7 100644
--- a/functions/main
+++ b/functions/main
@@ -639,7 +639,9 @@ static_decompressed_dirname()
                 # and extract base directory name with awk.
                 # tar 1.23 reports an error when using pipes, so
                 # remove error message with "2> /dev/null"
-                local DIRNAME=$(tar ${TAR_OPTS} -tf ${LFS_PKG_DIR}/${PACKAGE}.tar.bz2 2> /dev/null | head -n1 | sed 's!^\./!!' | awk -F \/ '{print $1}')
+                local DIRNAME=$(tar ${TAR_OPTS} -tf \
+                    ${LFS_PKG_DIR}/${PACKAGE}.${arch_ext} 2> /dev/null | \
+                    head -n1 | sed 's!^\./!!' | awk -F \/ '{print $1}')
                 echo ${DIRNAME}
                 ;;
             zip)