r3122 - in jhalfs/branches/experimental: CLFS CLFS2 HLFS LFS common

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Sat Sep 16 10:46:01 PDT 2006


Author: manuel
Date: 2006-09-16 11:45:58 -0600 (Sat, 16 Sep 2006)
New Revision: 3122

Modified:
   jhalfs/branches/experimental/CLFS/master.sh
   jhalfs/branches/experimental/CLFS2/master.sh
   jhalfs/branches/experimental/HLFS/master.sh
   jhalfs/branches/experimental/LFS/master.sh
   jhalfs/branches/experimental/common/common-functions
Log:
Fixed create-sbu_du-report target run (I think)

Modified: jhalfs/branches/experimental/CLFS/master.sh
===================================================================
--- jhalfs/branches/experimental/CLFS/master.sh	2006-09-15 21:19:27 UTC (rev 3121)
+++ jhalfs/branches/experimental/CLFS/master.sh	2006-09-16 17:45:58 UTC (rev 3122)
@@ -1000,9 +1000,6 @@
 
   done
 
-  # Add SBU-disk_usage report target if required
-  if [[ "$REPORT" = "y" ]] ; then wrt_report ; fi
-
 }
 
 #--------------------------------------#
@@ -1076,10 +1073,6 @@
     PREV=$this_script
   done
 
-  # Add SBU-disk_usage report target if required
-  if [[ "$REPORT" = "y" ]] ; then wrt_report ; fi
-
-
 }
 
 
@@ -1184,7 +1177,7 @@
 (
 cat << EOF
 
-all: ck_UID mk_SETUP mk_CROSS mk_SUDO mk_SYSTOOLS
+all: ck_UID mk_SETUP mk_CROSS mk_SUDO mk_SYSTOOLS create-sbu_du-report
 	@sudo make do-housekeeping
 	@\$(call echo_finished,$VERSION)
 
@@ -1206,6 +1199,7 @@
 mk_CROSS: mk_SETUP
 	@\$(call echo_PHASE,Cross and Temporary Tools)
 	@(sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make AS_LUSER" )
+	@sudo make restore-luser-env
 	@touch \$@
 
 mk_SUDO: mk_CROSS
@@ -1238,8 +1232,35 @@
 SUDO:	     $orphan_scripts
 CHROOT_JAIL: ${chroottools}${boottools} $testsuitetools $basicsystem  $bootscripttools  $bootabletools
 
+do-housekeeping:
+	@-umount \$(MOUNT_PT)/dev/pts
+	@-umount \$(MOUNT_PT)/dev/shm
+	@-umount \$(MOUNT_PT)/dev
+	@-umount \$(MOUNT_PT)/sys
+	@-umount \$(MOUNT_PT)/proc
+	@-rm /tools /cross-tools
+	@-if [ ! -f luser-exist ]; then \\
+		userdel \$(LUSER); \\
+		rm -rf /home/\$(LUSER); \\
+	fi;
+
 EOF
 ) >> $MKFILE
+
+  # Add SBU-disk_usage report target
+  echo "create-sbu_du-report:" >> $MKFILE
+  if [[ "$REPORT" = "y" ]] ; then
+(
+    cat << EOF
+	@\$(call echo_message, Building)
+	@./create-sbu_du-report.sh logs $VERSION
+	@\$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report)
+	@touch  \$@
+
+EOF
+) >> $MKFILE
+  else echo -e "\t at true\n" >> $MKFILE; fi
+
 fi
 
 ################### BOOT #####################
@@ -1322,18 +1343,6 @@
 	echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
 	echo --------------------------------------------------------------------------------\$(WHITE)
 
-do-housekeeping:
-	@-umount \$(MOUNT_PT)/dev/pts
-	@-umount \$(MOUNT_PT)/dev/shm
-	@-umount \$(MOUNT_PT)/dev
-	@-umount \$(MOUNT_PT)/sys
-	@-umount \$(MOUNT_PT)/proc
-	@-rm /tools /cross-tools
-	@-if [ ! -f luser-exist ]; then \\
-		userdel \$(LUSER); \\
-		rm -rf /home/\$(LUSER); \\
-	fi;
-
 ########################################################
 
 

Modified: jhalfs/branches/experimental/CLFS2/master.sh
===================================================================
--- jhalfs/branches/experimental/CLFS2/master.sh	2006-09-15 21:19:27 UTC (rev 3121)
+++ jhalfs/branches/experimental/CLFS2/master.sh	2006-09-16 17:45:58 UTC (rev 3122)
@@ -412,9 +412,6 @@
 
   done
 
-  # Add SBU-disk_usage report target if required
-  if [[ "$REPORT" = "y" ]] ; then wrt_report ; fi
-
 }
 
 
@@ -468,7 +465,7 @@
 (
 cat << EOF
 
-all:	ck_UID mk_SETUP mk_LUSER mk_ROOT
+all:	ck_UID mk_SETUP mk_LUSER mk_ROOT create-sbu_du-report
 	@sudo make do-housekeeping
 	@\$(call echo_finished,$VERSION)
 
@@ -527,6 +524,21 @@
 EOF
 ) >> $MKFILE
 
+  # Add SBU-disk_usage report target
+  echo "create-sbu_du-report:" >> $MKFILE
+  if [[ "$REPORT" = "y" ]] ; then
+(
+    cat << EOF
+	@\$(call echo_message, Building)
+	@./create-sbu_du-report.sh logs $VERSION
+	@\$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report)
+	@touch  \$@
+
+
+EOF
+) >> $MKFILE
+  else echo -e "\t at true\n\n" >> $MKFILE; fi
+
   # Bring over the items from the Makefile.tmp
   cat $MKFILE.tmp >> $MKFILE
   rm $MKFILE.tmp

Modified: jhalfs/branches/experimental/HLFS/master.sh
===================================================================
--- jhalfs/branches/experimental/HLFS/master.sh	2006-09-15 21:19:27 UTC (rev 3121)
+++ jhalfs/branches/experimental/HLFS/master.sh	2006-09-16 17:45:58 UTC (rev 3122)
@@ -558,7 +558,7 @@
 (
   cat << EOF
 
-all:	ck_UID mk_SETUP mk_LUSER mk_SUDO mk_CHROOT mk_BOOT
+all:	ck_UID mk_SETUP mk_LUSER mk_SUDO mk_CHROOT mk_BOOT create-sbu_du-repor
 	@sudo make do-housekeeping
 	@\$(call echo_finished,$VERSION)
 
@@ -684,6 +684,21 @@
 EOF
 ) >> $MKFILE
 
+  # Add SBU-disk_usage report target
+  echo "create-sbu_du-report:" >> $MKFILE
+  if [[ "$REPORT" = "y" ]] ; then
+(
+    cat << EOF
+	@\$(call echo_message, Building)
+	@./create-sbu_du-report.sh logs $VERSION
+	@\$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report)
+	@touch  \$@
+
+
+EOF
+) >> $MKFILE
+  else echo -e "\t at true\n\n" >> $MKFILE; fi
+
   # Bring over the items from the Makefile.tmp
   cat $MKFILE.tmp >> $MKFILE
   rm $MKFILE.tmp

Modified: jhalfs/branches/experimental/LFS/master.sh
===================================================================
--- jhalfs/branches/experimental/LFS/master.sh	2006-09-15 21:19:27 UTC (rev 3121)
+++ jhalfs/branches/experimental/LFS/master.sh	2006-09-16 17:45:58 UTC (rev 3122)
@@ -351,8 +351,6 @@
     PREV=${this_script}
   done  # for file in chapter0{7,8,9}/*
 
-  # Add SBU-disk_usage report target if required
-  if [[ "$REPORT" = "y" ]] ; then wrt_report ; fi
 }
 
 
@@ -436,7 +434,7 @@
 (
     cat << EOF
 
-all:	ck_UID mk_SETUP mk_LUSER mk_SUDO mk_CHROOT mk_BOOT
+all:	ck_UID mk_SETUP mk_LUSER mk_SUDO mk_CHROOT mk_BOOT create-sbu_du-report
 	@sudo make do_housekeeping
 	@\$(call echo_finished,$VERSION)
 
@@ -456,6 +454,7 @@
 mk_LUSER: mk_SETUP
 	@\$(call echo_SULUSER_request)
 	@( sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make LUSER" )
+	@sudo make restore-luser-env
 	@touch \$@
 
 mk_SUDO: mk_LUSER
@@ -477,7 +476,6 @@
 	@sudo sed -e 's|^ln -sv |ln -svf |' -i \$(CMDSDIR)/chapter06/063-createfiles
 	@\$(call echo_CHROOT_request)
 	@( sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make CHROOT")
-	@sudo make restore-luser-env
 	@touch \$@
 
 mk_BOOT: mk_CHROOT
@@ -564,16 +562,26 @@
 	  fi;\\
 	fi;
 
+EOF
+) >> $MKFILE
 
+  # Add SBU-disk_usage report target
+  echo "create-sbu_du-report:" >> $MKFILE
+  if [[ "$REPORT" = "y" ]] ; then
+(
+    cat << EOF
+	@\$(call echo_message, Building)
+	@./create-sbu_du-report.sh logs $VERSION
+	@\$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report)
+	@touch  \$@
 
+
 EOF
 ) >> $MKFILE
+  else echo -e "\t at true\n\n" >> $MKFILE; fi
 
-
-
   # Bring over the items from the Makefile.tmp
   cat $MKFILE.tmp >> $MKFILE
   rm $MKFILE.tmp
   echo "Creating Makefile... ${BOLD}DONE${OFF}"
 }
-

Modified: jhalfs/branches/experimental/common/common-functions
===================================================================
--- jhalfs/branches/experimental/common/common-functions	2006-09-15 21:19:27 UTC (rev 3121)
+++ jhalfs/branches/experimental/common/common-functions	2006-09-16 17:45:58 UTC (rev 3122)
@@ -66,7 +66,7 @@
     clfs  ) MOUNT_ENV="CLFS" ;;
     clfs2 ) MOUNT_ENV="CLFS" ;;
     hlfs  ) MOUNT_ENV="HLFS" ;;
-    *) echo "undefined progname $PROGNAME"; exit 1
+    *) echo "undefined progname $PROGNAME"; exit 1 ;;
   esac
 
 (
@@ -78,22 +78,6 @@
 }
 
 
-#----------------------------------#
-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
-}
-
-
 #------------------------------------------------------#
 #------------------------------------------------------#
 
@@ -343,7 +327,7 @@
   # Test if make must be run.
   if [ "$RUNMAKE" = "y" ] ; then
     # Test to make sure we're running the build as root
-    if [ "$UID" = "0" ] ; then    
+    if [ "$UID" = "0" ] ; then
       echo "You must not be logged in as root to build the system."
       exit 1
     fi




More information about the alfs-log mailing list