Changeset 53f291f

Timestamp:

10/16/2006 06:17:01 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk

Children:

e7655b2

Parents:

93d32cf

Message:

Using TRACKING_DIR for CUSTOM_TOOLS.

Files:

• Config.in (modified) (2 diffs)
• common/custom_pkgs (modified) (2 diffs)
• common/func_validate_configs.sh (modified) (2 diffs)

Config.in

@@ -268 +268 @@
         #--- 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
@@ -390 +401 @@
                 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

common/custom_pkgs

@@ -21 +21 @@
 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 \$@
@@ -49 +49 @@
         @\$(call remove_build_dirs2,${PKG})
         @touch \$@
-        @touch /var/lib/jhalfs/BLFS/${PKG}-${PKG_VERSION}
+        @touch ${TRACKING_DIR}/${PKG}-${PKG_VERSION}
         @\$(call housekeeping)
 EOF

common/func_validate_configs.sh

@@ -28 +28 @@
 
   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,'
@@ -191 +192 @@
   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_}"