From d7390a52cfc5bf1d293340f411666fb71d7cbdef Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre@linuxfromscratch.org>
Date: Fri, 10 Feb 2012 09:33:23 +0000
Subject: [PATCH] Changes the logic of "rebuild files" so that jhalfs does not
 stop if this item is ticked and the build dir is empty

---
 Config.in               |  2 +-
 common/common-functions | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Config.in b/Config.in
index 5dc23ab..5bbf4dc 100644
--- a/Config.in
+++ b/Config.in
@@ -260,7 +260,7 @@ menu "--- BOOK Settings"
 		default	"hppa1.1-unknown-linux-gnu"	if  PROC_hppa1
 		default	"hppa2.0-unknown-linux-gnu"	if  PROC_hppa2
 
-		default	"arm-unknown-linux-gnueabi"	if  ARCH_ARM && BOOK_CLFS2
+		default	"arm-unknown-linux-gnu"		if  ARCH_ARM && BOOK_CLFS2
 
 		default "arm-unknown-linux-uclibc"	if  PROC_ARM
 		default "armv5l-unknown-linux-uclibc"	if  PROC_ARM5L
diff --git a/common/common-functions b/common/common-functions
index 4f2b8e9..1a41f20 100644
--- a/common/common-functions
+++ b/common/common-functions
@@ -46,21 +46,25 @@ run_make() {                 #
 #----------------------------#
 clean_builddir() {           #
 #----------------------------#
-  # Test if the clean must be done.
-  if [ "${CLEAN}" = "y" ]; then
+# Test if the clean must be done.
+if [ "${CLEAN}" = "y" ]; then
+  # If empty (i.e. could contain lost+found), do not do anything
+  if $(ls $BUILDDIR/* > /dev/null 2>&1) &&
+       [ "$(ls $BUILDDIR)" != "lost+found" ]; then
     # Test to make sure that the build directory was populated by jhalfs
     if [ ! -d $JHALFSDIR ] || [ ! -d $BUILDDIR/sources ] ; then
       echo "Looks like $BUILDDIR was not populated by a previous jhalfs run."
       exit 1
     # Test that dev filesystems are not mounted in $BUILDDIR
     elif mount | grep $BUILDDIR/dev > /dev/null ; then
-      echo "Looks like kernel fylesystems are yet mounted on $BUILDDIR."
+      echo "Looks like kernel filesystems are still mounted on $BUILDDIR."
       exit 1
     else
       # Clean the build directory
       echo -n "Cleaning $BUILDDIR ..."
       # First delete proc and sys directories, if exist.
-      # Both should be empty. If not, be sure to exit.
+      # Both should be empty. If not, we exit, and the rmdir command
+      # has generated an error message
       if [ -d $BUILDDIR/proc ] ; then
         sudo rmdir $BUILDDIR/proc || exit 1
       fi
@@ -77,6 +81,7 @@ clean_builddir() {           #
       echo "done"
     fi
   fi
+fi
 }
 
 VERBOSITY2=$VERBOSITY
@@ -106,4 +111,4 @@ source $COMMON_DIR/libs/func_blfs_deps
 [[ $? > 0 ]] && echo "file libs/func_blfs_deps did not load.." && exit 1
 [[ $VERBOSITY2 > 0 ]] && echo "OK"
 
-[[ $VERBOSITY2 > 0 ]] && echo -n "    ..."
\ No newline at end of file
+[[ $VERBOSITY2 > 0 ]] && echo -n "    ..."