Changeset 453bef0

Timestamp:

04/26/2006 07:59:19 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

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

Children:

3ab7be7

Parents:

9ea3d54

Message:

Create SBU and disk usage report by default.

Files:

• CLFS/master.sh (modified) (2 diffs)
• HLFS/master.sh (modified) (1 diff)
• LFS/master.sh (modified) (1 diff)
• common/common-functions (modified) (1 diff)
• common/config (modified) (1 diff)
• common/func_validate_configs.sh (modified) (2 diffs)
• common/makefile-functions (modified) (1 diff)
• master.sh (modified) (1 diff)

CLFS/master.sh

@@ -785 +785 @@
   done
 
+  # Add SBU-disk_usage report target if required
+  if [[ "$REPORT" = "1" ]] ; then wrt_report ; fi
+
 }
 
@@ -861 +864 @@
 
   done
+
+  # Add SBU-disk_usage report target if required
+  if [[ "$REPORT" = "1" ]] ; then wrt_report ; fi
 
 }

HLFS/master.sh

@@ -499 +499 @@
     PREV=$this_script
   done  # for file in chapter07/*
+
+  # Add SBU-disk_usage report target if required
+  if [[ "$REPORT" = "1" ]] ; then wrt_report ; fi
 }
 

LFS/master.sh

@@ -288 +288 @@
     PREV=${this_script}
   done  # for file in chapter0{7,8,9}/*
+
+  # Add SBU-disk_usage report target if required
+  if [[ "$REPORT" = "1" ]] ; then wrt_report ; fi
 }
 

common/common-functions

@@ -388 +388 @@
 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

@@ -84 +84 @@
 
   # 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 MODEL GRSECURITY_HOST TEST REPORT 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 STRIP FSTAB BOOT_CONFIG CONFIG KEYMAP VIMLANG PAGE TIMEZONE LANG"
+  local -r  lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE HPKG RUNMAKE                       TEST REPORT 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,'
@@ -132 +132 @@
         RUNMAKE)   validation_str="x0x x1x";          validate_str; continue ;;
         TEST)      validation_str="x0x x1x x2x x3x";  validate_str; continue ;;
+        REPORT)    validation_str="x0x x1x";          validate_str;
+            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 ;;
         STRIP)     validation_str="x0x x1x";          validate_str; continue ;;
         VIMLANG)   validation_str="x0x x1x";          validate_str; continue ;;

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
 

master.sh

@@ -461 +461 @@
     popd 1> /dev/null
   fi
+  [[ "$REPORT" = "1" ]] && cp $COMMON_DIR/create-sbu_du-report.sh  $JHALFSDIR/
   sed 's,FAKEDIR,'$BOOK',' $PACKAGE_DIR/$XSL > $JHALFSDIR/${XSL}
   export XSL=$JHALFSDIR/${XSL}