From 340ea470736411a0fb1abed96caa0a8356dc81f1 Mon Sep 17 00:00:00 2001
From: gobo72 <gobo72@364a67c3-989e-7be9-548d-dae8560ea662>
Date: Thu, 1 Sep 2011 05:49:13 +0000
Subject: [PATCH] =?utf8?q?Ajout=20option=20pour=20ne=20pas=20d=C3=A9compre?=
 =?utf8?q?sser=20automatiquement=20un=20paquet?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 functions/ipkg | 38 +++++++++++++++++++++++---------------
 functions/main | 20 +++++++++++++++-----
 2 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/functions/ipkg b/functions/ipkg
index 77f51c4..bba883d 100644
--- a/functions/ipkg
+++ b/functions/ipkg
@@ -97,20 +97,24 @@ ipkg_finish()
     # Make sure to return to scripts directory
     cd ${SCRDIR}
 
-    # Saving package build size in global variable
-    BUILD_SIZE=$(du -h -s -c ${LFS_TMP}/${PACKAGE} ${LFS_TMP}/${PACKAGE}-build | grep total | awk '{ print $1 }')
-
-    # Some scripts need to preserve the source or build directory. They can
-    # do so by renaming them.
-    if [ -d ${LFS_TMP}/${PACKAGE} ]; then
-	# Removing source directory
-        echo "Removing source directory"
-	rm -rf ${LFS_TMP}/${PACKAGE}
-    fi
-    if [ -d ${LFS_TMP}/${PACKAGE}-build ]; then
-	# Removing build directory
-        echo "Removing build directory"
-	rm -rf ${LFS_TMP}/${PACKAGE}-build
+    if [ "x${DECOMPRESS}" = "x1" ]; then
+        # Saving package build size in global variable
+        BUILD_SIZE=$(du -h -s -c ${LFS_TMP}/${PACKAGE} ${LFS_TMP}/${PACKAGE}-build | grep total | awk '{ print $1 }')
+
+        # Some scripts need to preserve the source or build directory. They can
+        # do so by renaming them.
+        if [ -d ${LFS_TMP}/${PACKAGE} ]; then
+	    # Removing source directory
+            echo "Removing source directory"
+	    rm -rf ${LFS_TMP}/${PACKAGE}
+        fi
+        if [ -d ${LFS_TMP}/${PACKAGE}-build ]; then
+	    # Removing build directory
+            echo "Removing build directory"
+	    rm -rf ${LFS_TMP}/${PACKAGE}-build
+        fi
+    else
+        BUILD_SIZE="Unknown"
     fi
 }
 
@@ -126,7 +130,11 @@ ipkg_script()
         PACKAGE_DEF=${SCRDIR}/pkg/$(get_pkg_name ${PACKAGE})
     fi
 
-    ipkg_decompress_package
+    if [ "x${DECOMPRESS}" = "x1" ]; then
+        ipkg_decompress_package
+    else
+        SOURCE_SIZE="Unknown"
+    fi
 
     if [ -f ${PACKAGE_DEF} ]; then
         echo "Load custom package functions and definitions from ${PACKAGE_DEF}"
diff --git a/functions/main b/functions/main
index c8d2356..ec0e911 100644
--- a/functions/main
+++ b/functions/main
@@ -796,6 +796,7 @@ indicate_pkg_build_complete()
 # Arg. #1: Package name and version (ex: gcc-4.5.1)
 # Remaining arguments: Additional configure options
 # Options:
+#   -c     Do not decompress package to ${LFS_TMP}
 #   -j     Disable parallel make for this package
 #   -l     Unique identification label in 'install.log'
 #          (default is package name and version)
@@ -812,15 +813,21 @@ ipkg()
     START_TIME=$(echo `date +%s`)
 
     unset ALT_SCRIPT_NAME
+
+    export DECOMPRESS="1"
     export IPKG_MODE="ac" # Default mode if not specified
     export HVLABEL="" # Global variable
 
     local HVMAKE_ORIG=${HVMAKE}
 
-    while getopts "jl:m:s:" flag ;do
+    while getopts "cjl:m:s:" flag ;do
         case ${flag} in
+            c)
+                # Do not decompress package
+                DECOMPRESS="0"
+                ;;
             j)
-                # Disable parallel make onlyfor this package
+                # Disable parallel make only for this package
                 HVMAKE="make"
                 ;;
 	    l)
@@ -908,6 +915,12 @@ ipkg()
     # Make sure we are at a known location
     cd ${SCRDIR}
 
+    if [ "x${LFS_STAGE}" != "xstage0" -a "x${LFS_STAGE}" != "xstage1" ]; then
+	# Make sure to update dynamic linker run-time bindings, except for
+	# stages 0 and 1 where we run as the LFS user.
+	ldconfig
+    fi
+
     exec 1>&6 # Restore stdout.
 
     # Displaying build time after the package name.
@@ -921,9 +934,6 @@ ipkg()
 
     ipkg_trap_end
 
-    # Make sure to update dynamic linker run-time bindings
-    ldconfig
-
     return $EXIT_SUCCESS
 }
 
-- 
2.20.1