Changeset f546320 for common

Timestamp:

06/03/2007 09:06:13 AM (17 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

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

Children:

05760bc

Parents:

350625a

Message:

Ported INSTALL_LOG support to all books.

Location:

common

Files:

• libs/func_validate_configs.sh (modified) (2 diffs)
• libs/func_wrt_Makefile (modified) (2 diffs)
• makefile-functions (modified) (1 diff)

common/libs/func_validate_configs.sh

@@ -26 +26 @@
                             SERVER GETKERNEL RUNMAKE"
   local -r    BUILD_chroot="TEST BOMB_TEST STRIP"
-  local -r    BUILD_common="FSTAB CONFIG TIMEZONE PAGE LANG"
+  local -r    BUILD_common="FSTAB CONFIG TIMEZONE PAGE LANG INSTALL_LOG"
   local -r ADVANCED_chroot="COMPARE RUN_ICA RUN_FARCE ITERATIONS OPTIMIZE"
   local -r ADVANCED_common="REPORT REBUILD_MAKEFILE"
@@ -38 +38 @@
 
   # Build Settings by book
-  local -r   LFS_build="$BUILD_chroot $BUILD_common VIMLANG INSTALL_LOG"
-  local -r  HLFS_build="$BUILD_chroot $BUILD_common LC_ALL"
-  local -r  CLFS_build="$BUILD_chroot $BUILD_common VIMLANG"
-  local -r CLFS2_build="STRIP         $BUILD_common VIMLANG"
-  local -r CLFS3_build="              $BUILD_common"
+  local -r   LFS_build="$BUILD_chroot VIMLANG $BUILD_common"
+  local -r  HLFS_build="$BUILD_chroot         $BUILD_common LC_ALL"
+  local -r  CLFS_build="$BUILD_chroot VIMLANG $BUILD_common"
+  local -r CLFS2_build="STRIP         VIMLANG $BUILD_common"
+  local -r CLFS3_build="                      $BUILD_common"
 
   # Full list of books settings

common/libs/func_wrt_Makefile

@@ -311 +311 @@
 
 #----------------------------------#
+LUSER_wrt_TouchTimestamp() {       #
+#----------------------------------#
+(
+cat << EOF
+        @\$(call touch_timestamp_LUSER)
+EOF
+) >> $MKFILE.tmp
+}
+
+#----------------------------------#
 CHROOT_wrt_TouchTimestamp() {      #
 #----------------------------------#
@@ -321 +331 @@
 
 #----------------------------------#
+LUSER_wrt_LogNewFiles() {          #
+#----------------------------------#
+  local name=$1
+(
+cat << EOF
+        @\$(call log_new_files_LUSER,$name)
+EOF
+) >> $MKFILE.tmp
+}
+
+#----------------------------------#
 CHROOT_wrt_LogNewFiles() {         #
 #----------------------------------#

common/makefile-functions

@@ -116 +116 @@
 endef
 
+define touch_timestamp_LUSER
+  @touch $(SRCDIR)/timestamp-marker && sleep 1
+endef
+
 define log_new_files
   @find / -xdev ! -path "/$(SCRIPT_ROOT)/*" ! -path "/tmp/*" ! -path "$(SRC)/*" \
   -newer $(SRC)/timestamp-marker -not -type d \
   -printf "%p\t%s\t%u:%g\t%m\t%l\n" | sort > $(crFILELOGDIR)/$(1)
+endef
+
+define log_new_files_LUSER
+  @find $(BASEDIR) -xdev ! -path "$(BASEDIR)/$(SCRIPT_ROOT)/*" ! -path "$(BASEDIR)/tmp/*" ! -path "$(SRCDIR)/*" \
+  -newer $(SRCDIR)/timestamp-marker -not -type d \
+  -printf "%p\t%s\t%u:%g\t%m\t%l\n" | sort > $(BASEDIR)$(crFILELOGDIR)/$(1)
 endef