Changeset 9e4b9a1 for common

Timestamp:

04/26/2006 08:24:58 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

experimental

Children:

2f109c6

Parents:

4edbc92

Message:

Merged r2575 and r2576 from trunk.

Location:

common

Files:

• common-functions (modified) (1 diff)
• config (modified) (1 diff)
• create-sbu_du-report.sh (added)
• func_validate_configs.sh (modified) (3 diffs)
• makefile-functions (modified) (1 diff)

common/common-functions

@@ -397 +397 @@
 EOF
 ) >> $MKFILE.tmp
+}
+
+
+#----------------------------------#
+wrt_report() {         #
+#----------------------------------#
+(
+cat << EOF
+
+create-sbu_du-report:  $PREV
+        @\$(call echo_message, Building)
+        @./create-sbu_du-report.sh logs $VERSION $TEST
+        @\$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report)
+        @touch  \$@
+EOF
+) >> $MKFILE.tmp
+
+chapter789="$chapter789 create-sbu_du-report"
 }
 

common/config

@@ -36 +36 @@
 #      (in CLFS, alias to 2)
 TEST=1
+
+# Create SBU and disk usage report  0(no)/1(yes)
+# NOTE: requires to have bc installed on the host
+REPORT=1
 
 #--- Run the stripping phases  0(no)/1(yes)

common/func_validate_configs.sh

@@ -88 +88 @@
   # 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 COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB             CONFIG KEYMAP         PAGE TIMEZONE LANG LC_ALL"
-  local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG RUNMAKE METHOD  ARCH  TARGET  TEST COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB BOOT_CONFIG CONFIG KEYMAP VIMLANG PAGE TIMEZONE LANG"
-  local -r  lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG RUNMAKE                       TEST COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB             CONFIG        VIMLANG PAGE TIMEZONE LANG"
+  local -r hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG RUNMAKE MODEL GRSECURITY_HOST TEST REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB             CONFIG KEYMAP         PAGE TIMEZONE LANG LC_ALL"
+  local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG RUNMAKE METHOD  ARCH  TARGET  TEST REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB BOOT_CONFIG CONFIG KEYMAP VIMLANG PAGE TIMEZONE LANG"
+  local -r  lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG RUNMAKE                       TEST REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS 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,'
@@ -100 +100 @@
   local validation_str
   local save_param
-  
+
   write_error_and_die() {
     echo -e "\n${DD_BORDER}"
@@ -182 +182 @@
       HPKG)       validate_against_str "x0x x1x" ;;
       RUNMAKE)    validate_against_str "x0x x1x" ;;
+      REPORT)     validate_against_str "x0x x1x"
+                  if [[ "${!config_param}" = "1" ]] && [[ `type -p bc` ]]; then
+                    continue
+                  else
+                    echo -e "  ${BOLD}The bc binary was not found${OFF}"
+                    echo -e "  The SBU and disk usage report creation will be skiped"
+                    REPORT=0
+                    continue
+                  fi ;;
       COMPARE)    if [[ ! "$COMPARE" = "1" ]]; then
                     validate_against_str "x0x x1x"

common/makefile-functions

@@ -29 +29 @@
   @cd $(SRC) && \
   tar -xvf `ls -t $(1) | head -n1` > /tmp/unpacked
+endef
+
+define echo_report
+  @echo
+  @echo $(BOLD) The report file $(BLUE)$(1)$(BOLD) has been created
+  @echo
+  @echo ${WHITE}Please send the $(BOLD)$(MOUNT_PT)/jhalfs/$(1)$(WHITE)
+  @echo file to $(BOLD)manuel@linuxfromscratch.org$(WHITE)
+  @echo
+  @echo That will help us to keep more accurate SBU and
+  @echo disk usage values into the book. Thanks.
 endef