r3098 - in jhalfs/branches/experimental: CLFS common

georgeb at linuxfromscratch.org georgeb at linuxfromscratch.org
Sun Sep 3 08:56:20 PDT 2006


Author: georgeb
Date: 2006-09-03 09:56:19 -0600 (Sun, 03 Sep 2006)
New Revision: 3098

Modified:
   jhalfs/branches/experimental/CLFS/master.sh
   jhalfs/branches/experimental/common/common-functions
Log:
Remove unnecessary flow tests. Added missing function, wrt_report. Added restore-luser-env to chroot build

Modified: jhalfs/branches/experimental/CLFS/master.sh
===================================================================
--- jhalfs/branches/experimental/CLFS/master.sh	2006-09-02 03:04:03 UTC (rev 3097)
+++ jhalfs/branches/experimental/CLFS/master.sh	2006-09-03 15:56:19 UTC (rev 3098)
@@ -329,13 +329,13 @@
 
     pkg_tarball=$(get_package_tarball_name $name)
     
-    # This is very ugly:: util-linux is in /chroot but should be run under LUSER
-    # A custom collection of routines.
+    # This is very ugly:: util-linux is in /chroot but must be run under LUSER
+    # .. Customized makefile entry 
     case "${this_script}" in
       *util-linux) 
          LUSER_wrt_target "${this_script}" "$PREV"
-         [[ "$pkg_tarball" != "" ]] && LUSER_wrt_unpack "$pkg_tarball"
-         [[ "$pkg_tarball" != "" ]] && [[ "$OPTIMIZE" = "2" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
+         LUSER_wrt_unpack "$pkg_tarball"
+         [[ "$OPTIMIZE" = "2" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
          LUSER_wrt_RunAsUser "${file}"
          LUSER_RemoveBuildDirs "${name}"
          wrt_touch
@@ -1181,7 +1181,7 @@
 (
 cat << EOF
 
-all: mk_SETUP mk_CROSS mk_TEMP mk_SYSTOOLS mk_FINAL mk_BOOTSCRIPT mk_BOOTABLE do-housekeeping
+all: mk_SETUP mk_CROSS mk_TEMP restore_luser_env mk_SYSTOOLS mk_FINAL mk_BOOTSCRIPT mk_BOOTABLE do-housekeeping
 	@\$(call echo_finished,$VERSION)
 
 #---------------AS ROOT

Modified: jhalfs/branches/experimental/common/common-functions
===================================================================
--- jhalfs/branches/experimental/common/common-functions	2006-09-02 03:04:03 UTC (rev 3097)
+++ jhalfs/branches/experimental/common/common-functions	2006-09-03 15:56:19 UTC (rev 3098)
@@ -79,6 +79,22 @@
 
 
 #----------------------------------#
+wrt_report() {                     #
+#----------------------------------#
+(
+cat << EOF
+
+create-sbu_du-report:  $PREV
+	@\$(call echo_message, Building)
+	@./create-sbu_du-report.sh logs $VERSION
+	@\$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report)
+	@touch  \$@
+EOF
+) >> $MKFILE.tmp
+}
+
+
+#----------------------------------#
 wrt_target_boot() {                # Create target and initialize log file
 #----------------------------------#
   local i=$1




More information about the alfs-log mailing list