Changeset 42e1b38

Timestamp:

10/13/2006 10:45:40 PM (18 years ago)

Author:

George Boudreau <georgeb@…>

Branches:

experimental

Children:

6dc325f

Parents:

2ee1d11

Message:

Add code for user defined scripts. User scripts added at the end of the final build (LFS only)

Files:

• Config.in (modified) (1 diff)
• README.CUSTOM (added)
• common/common-functions (modified) (1 diff)
• common/custom_pkgs (added)
• common/func_validate_configs.sh (modified) (2 diffs)
• custom/examples/950-bc (added)
• custom/examples/951-glib (added)
• custom/examples/952-mc (added)
• custom/examples/953-gpm (added)
• custom/examples/999-blfs_bootscripts (added)
• custom/template (added)
• jhalfs (modified) (3 diffs)

Config.in

@@ -400 +400 @@
                         #   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/common-functions

@@ -802 +802 @@
   fi
 
+  if [[ "${CUSTOM_TOOLS}" = "y" ]]; then
+    add_CustomToolsURLS
+  fi
+
 }
 

common/func_validate_configs.sh

@@ -24 +24 @@
   local -r  clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE METHOD ARCH TARGET TARGET32 TEST BOMB_TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB BOOT_CONFIG CONFIG GETKERNEL VIMLANG PAGE TIMEZONE LANG        LUSER LGROUP BLFS_TOOL"
   local -r clfs2_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE        ARCH TARGET                         OPTIMIZE REPORT                                      STRIP FSTAB             CONFIG GETKERNEL VIMLANG PAGE TIMEZONE LANG        LUSER LGROUP BLFS_TOOL"
-  local -r   lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE                             TEST BOMB_TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB             CONFIG GETKERNEL VIMLANG PAGE TIMEZONE LANG        LUSER LGROUP BLFS_TOOL"
+  local -r   lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE                             TEST BOMB_TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB             CONFIG GETKERNEL VIMLANG PAGE TIMEZONE LANG        LUSER LGROUP BLFS_TOOL CUSTOM_TOOLS"
   local -r  blfs_PARAM_LIST="BRANCH_ID BLFS_ROOT BLFS_XML TRACKING_DIR"
 
@@ -111 +111 @@
       GRSECURITY_HOST | \
       BLFS_TOOL       | \
+      CUSTOM_TOOLS    | \
       TIMEZONE        | \
       PAGE)   echo -e "`eval echo $PARAM_VALS`" ;;

jhalfs

@@ -265 +265 @@
 [[ $? > 0 ]] && echo " function module did not load.." && exit 2
 [[ $VERBOSITY > 0 ]] && echo "OK"
+
+[[ $VERBOSITY > 0 ]] && echo -n "Loading function <custom_pkgs>..."
+source $COMMON_DIR/custom_pkgs
+[[ $? > 0 ]] && echo " function module did not load.." && exit 2
+[[ $VERBOSITY > 0 ]] && echo "OK"
+
+
 [[ $VERBOSITY > 0 ]] && echo "${SD_BORDER}${nl_}"
 
@@ -354 +361 @@
   popd 1> /dev/null
 fi
+#
+if [[ "${PROGNAME}" = "lfs" ]]; then
+  if [[ "${CUSTOM_TOOLS}" = "y" ]]; then
+    echo "Copying custom tool scripts to $JHALFSDIR"
+    mkdir -p $JHALFSDIR/custom-commands/config
+    mkdir -p $JHALFSDIR/custom-commands/scripts
+   cp -Rf custom/* $JHALFSDIR/custom-commands
+  fi
+fi
+
 #
 if [[ "$REPORT" = "y" ]]; then
@@ -408 +425 @@
 
 build_Makefile
+if [[ "${PROGNAME}" = "lfs" ]]; then
+  if [[ "${CUSTOM_TOOLS}" = "y" ]]; then
+    add_CustomTools
+  fi
+fi
 echo "${SD_BORDER}${nl_}"