r3191 - in jhalfs/trunk: . common

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Mon Oct 16 11:17:03 PDT 2006


Author: manuel
Date: 2006-10-16 12:17:01 -0600 (Mon, 16 Oct 2006)
New Revision: 3191

Modified:
   jhalfs/trunk/Config.in
   jhalfs/trunk/common/custom_pkgs
   jhalfs/trunk/common/func_validate_configs.sh
Log:
Using TRACKING_DIR for CUSTOM_TOOLS.

Modified: jhalfs/trunk/Config.in
===================================================================
--- jhalfs/trunk/Config.in	2006-10-16 17:26:37 UTC (rev 3190)
+++ jhalfs/trunk/Config.in	2006-10-16 18:17:01 UTC (rev 3191)
@@ -267,6 +267,17 @@
 		default "uclibc"	if LIB_UCLIBC
 	#--- End HLFS specific params
 
+	#--- Custom Tools support
+	config CUSTOM_TOOLS
+		bool	"Add custom tool support"
+		default	n
+		depends on BOOK_LFS
+		help
+			#--- Activating this option additional packages you create
+			#    will be installed.
+			#
+	#--- End Custom Tools support
+
 	#--- blfs-tool Support
 	config BLFS_TOOL
 		bool	"Add blfs-tool support"
@@ -389,28 +400,23 @@
 	config	TRACKING_DIR
 		string "Installed packages database directory"
 		default "/var/lib/jhalfs/BLFS"
-		depends on BOOK_BLFS || BLFS_TOOL
+		depends on BOOK_BLFS || BLFS_TOOL || CUSTOM_TOOLS
 		help
 			#-- Full path to the directory where the installed
 			#   packages database will be created.
 			#
-			#   You MUST to create manually this directory.
+			#   If you are installing blfs-tool on a running xLFS system
+                        #   you MUST to create manually this directory.
+                        #
+                        #   If you are installing blfs-tool as part of a xLFS build
+                        #   and/or using the customized scripts feature, you will
+                        #   need to fix that directory permissions after booting
+                        #   the new system.
 			#
 			#   Note that the user that will build the packages must
 			#   have read and write privileges on that directory.
 	#--- End BLFS specific params
-	
-	#--- Custom Tools support
-	config CUSTOM_TOOLS
-		bool	"Add custom tool support"
-		default	n
-		depends on BOOK_LFS
-		help
-			#--- Activating this option additional packages you create
-			#    will be installed.
-			#
-	#--- End Custom Tools support
-	
+
 #--- End BOOK Settings
 endmenu
 

Modified: jhalfs/trunk/common/custom_pkgs
===================================================================
--- jhalfs/trunk/common/custom_pkgs	2006-10-16 17:26:37 UTC (rev 3190)
+++ jhalfs/trunk/common/custom_pkgs	2006-10-16 18:17:01 UTC (rev 3191)
@@ -20,7 +20,7 @@
 
 mk_CUSTOM_TOOLS:
 	@\$(call echo_CHROOT_request)
-	@ sudo mkdir -p /home/georgeb/TRIAL/var/lib/jhalfs/BLFS
+	@ sudo mkdir -p ${BUILDDIR}${TRACKING_DIR}
 	@( sudo \$(CHROOT2) "cd \$(SCRIPT_ROOT) && make CUSTOM_TOOLS")
 	@touch \$@
 
@@ -48,7 +48,7 @@
 	@( time { source envars && /\$(SCRIPT_ROOT)/custom-commands/scripts/${THIS_SCRIPT} >>logs/${THIS_SCRIPT} 2>&1 ; } ) 2>>logs/${THIS_SCRIPT}
 	@\$(call remove_build_dirs2,${PKG})
 	@touch \$@
-	@touch /var/lib/jhalfs/BLFS/${PKG}-${PKG_VERSION}
+	@touch ${TRACKING_DIR}/${PKG}-${PKG_VERSION}
 	@\$(call housekeeping)
 EOF
 ) >> ${MKFILE}.tmp2

Modified: jhalfs/trunk/common/func_validate_configs.sh
===================================================================
--- jhalfs/trunk/common/func_validate_configs.sh	2006-10-16 17:26:37 UTC (rev 3190)
+++ jhalfs/trunk/common/func_validate_configs.sh	2006-10-16 18:17:01 UTC (rev 3191)
@@ -27,6 +27,7 @@
   local -r  blfs_PARAM_LIST="BRANCH_ID BLFS_ROOT BLFS_XML TRACKING_DIR"
 
   local -r  blfs_tool_PARAM_LIST="BLFS_BRANCH_ID BLFS_ROOT BLFS_XML TRACKING_DIR DEP_LIBXML DEP_LIBXSLT DEP_TIDY DEP_UNZIP DEP_DBXML DEP_DBXSL DEP_LINKS DEP_SUDO DEP_WGET DEP_SVN DEP_GPM"
+  local -r custom_tool_PARAM_LIST="TRACKING_DIR"
 
   local -r ERROR_MSG_pt1='The variable \"${L_arrow}${config_param}${R_arrow}\" value ${L_arrow}${BOLD}${!config_param}${R_arrow} is invalid,'
   local -r ERROR_MSG_pt2='rerun make and fix your configuration settings${OFF}'
@@ -190,6 +191,12 @@
     done
   fi
 
+  if [[ "${CUSTOM_TOOLS}" = "y" ]] && [[ "${BLFS_TOOL}" = "n" ]]  ; then
+    for config_param in ${custom_tool_PARAM_LIST}; do
+      echo -e "`eval echo $PARAM_VALS`"
+    done
+  fi
+
   set -e
   echo "${nl_}***${BOLD}${GREEN} ${PARAM_GROUP%%_*T} config parameters look good${OFF} ***${nl_}"
 }




More information about the alfs-log mailing list