r3472 - jhalfs/trunk

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Fri Sep 14 09:56:24 PDT 2007


Author: manuel
Date: 2007-09-14 10:56:24 -0600 (Fri, 14 Sep 2007)
New Revision: 3472

Modified:
   jhalfs/trunk/Config.in
   jhalfs/trunk/jhalfs
Log:
Be sure that JHALFSDIR is not set to the jhalfs sources directory.
Thanks to Dan Nicholson for the patch.

Modified: jhalfs/trunk/Config.in
===================================================================
--- jhalfs/trunk/Config.in	2007-09-14 16:47:17 UTC (rev 3471)
+++ jhalfs/trunk/Config.in	2007-09-14 16:56:24 UTC (rev 3472)
@@ -723,6 +723,9 @@
 		default "/mnt/build_dir"
 		help
 			#-- The directory where the created system will be located.
+			#   NOTE: A working directory named jhalfs will be created
+			#   here, so ensure this does not conflict with the jhalfs
+			#   source directory.
 
 	config	GETPKG
 		bool "Retrieve source files"

Modified: jhalfs/trunk/jhalfs
===================================================================
--- jhalfs/trunk/jhalfs	2007-09-14 16:47:17 UTC (rev 3471)
+++ jhalfs/trunk/jhalfs	2007-09-14 16:56:24 UTC (rev 3472)
@@ -119,6 +119,14 @@
 SET_MISC=${SET_MISC:=n}
 SET_BLOWFISH=${SET_BLOWFISH:=n}
 
+# Sanity check on the location of $BUILDDIR / $JHALFSDIR
+CWD=$(cd `dirname $0` && pwd)
+if [[ $JHALFSDIR == $CWD ]]; then
+    echo " The jhalfs source directory conflicts with the jhalfs build directory."
+    echo " Please move the source directory or change the build directory."
+    exit 2
+fi
+
 # Book surces envars
 BRANCH_ID=${BRANCH_ID:=development}
 




More information about the alfs-log mailing list