From 6471975aba32242e64ab5735ee2674cec460c2be Mon Sep 17 00:00:00 2001
From: Hugo Villeneuve <hugo@hugovil.com>
Date: Sun, 1 Mar 2015 21:12:02 -0500
Subject: [PATCH] Remove old build directory

---
 functions/ipkg | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/functions/ipkg b/functions/ipkg
index ca159bd..61ba492 100644
--- a/functions/ipkg
+++ b/functions/ipkg
@@ -24,13 +24,24 @@ unset -f hvconfig_cache
 unset -f hvconfig_post
 unset -f hvbuild_post
 
-ipkg_decompress_package()
+# Arg #1: Clean label for debug message (optional)
+function dir_cleanup()
 {
     # Removing old build directory (if any)
     if [ -d ${LFS_TMP}/${PACKAGE} ]; then
-        echo "Removing old build directory"
+        echo "Removing ${1} source directory"
 	rm -rf ${LFS_TMP}/${PACKAGE}
     fi
+    if [ -d ${LFS_TMP}/${PACKAGE}-build ]; then
+        echo "Removing ${1} build directory"
+        rm -rf ${LFS_TMP}/${PACKAGE}-build
+    fi
+}
+
+ipkg_decompress_package()
+{
+    # Removing old source and build directories (if any)
+    dir_cleanup "old"
 
     echo "Decompressing package"
     decompress_package ${PACKAGE}
@@ -112,15 +123,7 @@ ipkg_finish()
 
         # 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
-            echo "Removing build directory"
-            rm -rf ${LFS_TMP}/${PACKAGE}-build
-        fi
+        dir_cleanup
     else
         BUILD_SIZE="Unknown"
     fi
-- 
2.20.1