r2489 - in jhalfs/branches/experimental: . LFS common

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Sat Apr 8 05:21:35 PDT 2006


Author: manuel
Date: 2006-04-08 06:21:34 -0600 (Sat, 08 Apr 2006)
New Revision: 2489

Modified:
   jhalfs/branches/experimental/LFS/master.sh
   jhalfs/branches/experimental/common/common-functions
   jhalfs/branches/experimental/common/config
   jhalfs/branches/experimental/common/func_validate_configs.sh
   jhalfs/branches/experimental/master.sh
Log:
Started ICA support.

Modified: jhalfs/branches/experimental/LFS/master.sh
===================================================================
--- jhalfs/branches/experimental/LFS/master.sh	2006-04-08 11:32:14 UTC (rev 2488)
+++ jhalfs/branches/experimental/LFS/master.sh	2006-04-08 12:21:34 UTC (rev 2489)
@@ -155,7 +155,10 @@
     # dependencies and target creation.
     case "${this_script}" in
       *chroot)      continue ;;
-      *stripping*) [[ "${STRIP}" = "0" ]] && continue ;;
+      *stripping*) [[ "${STRIP}" = "0" ]] && continue
+                   [[ "${STRIP}" != "0" ]] && [[ "$RUN_ICA" != "0" ]] && \
+                   ICA_rebuild="$ICA_rebuild ${this_script}"
+      ;;
     esac
 
     # First append each name of the script files to a list (this will become
@@ -182,6 +185,8 @@
     if [ "$vrs" != "" ] ; then
       FILE="$name-$vrs.tar.*"
       wrt_unpack2 "$FILE"
+      # Add it to the ICA_rebuild target
+      [[ "$RUN_ICA" != "0" ]] && ICA_rebuild="$ICA_rebuild ${this_script}"
     fi
 
     # In the mount of kernel filesystems we need to set LFS
@@ -393,6 +398,15 @@
 EOF
 ) >> $MKFILE
 
+  # Add the ICA targets
+  [[ "$RUN_ICA" != "0" ]] && \
+(
+    cat << EOF
+ICA_rebuild:  $ICA_rebuild
+
+EOF
+) >> $MKFILE
+
   # Bring over the items from the Makefile.tmp
   cat $MKFILE.tmp >> $MKFILE
   rm $MKFILE.tmp

Modified: jhalfs/branches/experimental/common/common-functions
===================================================================
--- jhalfs/branches/experimental/common/common-functions	2006-04-08 11:32:14 UTC (rev 2488)
+++ jhalfs/branches/experimental/common/common-functions	2006-04-08 12:21:34 UTC (rev 2489)
@@ -76,6 +76,9 @@
 [[ ${PROGNAME} != "blfs" ]] &&
 cat <<- -EOF-
 
+${BOLD}  --do-ICA${OFF}
+         do the Iterative Comparison Analysis. That will take several time.
+
 ${BOLD}  -F, --fstab FILE${OFF}
         use FILE as the /etc/fstab file for the ${BOLD}$(echo $PROGNAME | tr [a-z] [A-Z])${OFF} system. If not specified,
         a default /etc/fstab file with dummy values is created.

Modified: jhalfs/branches/experimental/common/config
===================================================================
--- jhalfs/branches/experimental/common/config	2006-04-08 11:32:14 UTC (rev 2488)
+++ jhalfs/branches/experimental/common/config	2006-04-08 12:21:34 UTC (rev 2489)
@@ -72,5 +72,5 @@
 # Don't edit it unless you know what you are doing
 
 #--- Working directories
-JHALFSDIR=$BUILDDIR/jhalfs
+JHALFSDIR=$BUILDDIR/jhalfs-ica
    LOGDIR=$JHALFSDIR/logs

Modified: jhalfs/branches/experimental/common/func_validate_configs.sh
===================================================================
--- jhalfs/branches/experimental/common/func_validate_configs.sh	2006-04-08 11:32:14 UTC (rev 2488)
+++ jhalfs/branches/experimental/common/func_validate_configs.sh	2006-04-08 12:21:34 UTC (rev 2489)
@@ -85,10 +85,10 @@
 inline_doc
 
   # First internal variables, then the ones that change the book's flavour, and lastly system configuration variables
-  local -r blfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG          DEPEND               TEST"
-  local -r hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG RUNMAKE MODEL GRSECURITY_HOST TEST STRIP FSTAB             CONFIG KEYMAP         PAGE TIMEZONE LANG LC_ALL"
-  local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG RUNMAKE METHOD  ARCH  TARGET  TEST STRIP FSTAB BOOT_CONFIG CONFIG KEYMAP VIMLANG PAGE TIMEZONE LANG"
-  local -r  lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG RUNMAKE                       TEST STRIP FSTAB             CONFIG        VIMLANG PAGE TIMEZONE LANG"
+  local -r blfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG                 DEPEND                TEST"
+  local -r hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG RUNMAKE RUN_ICA MODEL GRSECURITY_HOST TEST STRIP FSTAB             CONFIG KEYMAP         PAGE TIMEZONE LANG LC_ALL"
+  local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG RUNMAKE RUN_ICA METHOD  ARCH  TARGET  TEST STRIP FSTAB BOOT_CONFIG CONFIG KEYMAP VIMLANG PAGE TIMEZONE LANG"
+  local -r  lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG RUNMAKE RUN_ICA                       TEST STRIP FSTAB             CONFIG        VIMLANG PAGE TIMEZONE LANG"
 
   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=' check the config file ${BOLD}${GREEN}\<$(echo $PROGNAME | tr [a-z] [A-Z])/config\> or \<common/config\>${OFF}'
@@ -132,6 +132,7 @@
         MKFILE)    continue;;
         HPKG)      validation_str="x0x x1x";          validate_str; continue ;;
         RUNMAKE)   validation_str="x0x x1x";          validate_str; continue ;;
+        RUN_ICA)   validation_str="x0x x1x";          validate_str; continue ;;
         TEST)      validation_str="x0x x1x x2x x3x";  validate_str; continue ;;
         STRIP)     validation_str="x0x x1x";          validate_str; continue ;;
         VIMLANG)   validation_str="x0x x1x";          validate_str; continue ;;

Modified: jhalfs/branches/experimental/master.sh
===================================================================
--- jhalfs/branches/experimental/master.sh	2006-04-08 11:32:14 UTC (rev 2488)
+++ jhalfs/branches/experimental/master.sh	2006-04-08 12:21:34 UTC (rev 2489)
@@ -210,6 +210,8 @@
       ;;
 
     # Common options for LFS, CLFS and HLFS
+    --do-ICA )              RUN_ICA=1    ;;
+
     --fstab | -F )
       test $# = 1 && eval "$exit_missing_arg"
       shift




More information about the alfs-log mailing list