r3224 - in jhalfs/trunk: . CLFS CLFS2 CLFS3 HLFS LFS common/libs

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Sun Nov 12 05:50:37 PST 2006


Author: manuel
Date: 2006-11-12 06:50:34 -0700 (Sun, 12 Nov 2006)
New Revision: 3224

Modified:
   jhalfs/trunk/CLFS/master.sh
   jhalfs/trunk/CLFS2/master.sh
   jhalfs/trunk/CLFS3/master.sh
   jhalfs/trunk/Config.in
   jhalfs/trunk/HLFS/master.sh
   jhalfs/trunk/LFS/master.sh
   jhalfs/trunk/README
   jhalfs/trunk/common/libs/func_wrt_Makefile
Log:
Changed how create-sbu_du-report target is created.
Added blfs-tool support to HLFS.

Modified: jhalfs/trunk/CLFS/master.sh
===================================================================
--- jhalfs/trunk/CLFS/master.sh	2006-11-12 12:10:25 UTC (rev 3223)
+++ jhalfs/trunk/CLFS/master.sh	2006-11-12 13:50:34 UTC (rev 3224)
@@ -1099,12 +1099,12 @@
 	@( sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make CHROOT_JAIL")
 	@touch \$@
 
-mk_BLFS_TOOL: mk_SYSTOOLS
-	@\$(call echo_PHASE,Building BLFS-TOOLS); \\
+mk_BLFS_TOOL: create-sbu_du-report
+	@\$(call echo_PHASE,Building BLFS-TOOLS)
 	@if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
 	  sudo mkdir -p $BUILDDIR$TRACKING_DIR; \\
 	  sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make BLFS_TOOL"; \\
-	fi
+	fi;
 	@touch \$@
 
 SETUP:       $host_prep
@@ -1113,6 +1113,15 @@
 CHROOT_JAIL: ${chroottools}${boottools} $testsuitetools $basicsystem  $bootscripttools  $bootabletools
 BLFS_TOOL:   $blfs_tool
 
+
+create-sbu_du-report:  mk_SYSTOOLS
+	@\$(call echo_message, Building)
+	@if [ "\$(ADD_REPORT)" = "y" ]; then \\
+	  ./create-sbu_du-report.sh logs $VERSION; \\
+	  \$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report); \\
+	fi;
+	@touch  \$@
+
 do-housekeeping:
 	@-umount \$(MOUNT_PT)/dev/pts
 	@-umount \$(MOUNT_PT)/dev/shm
@@ -1128,21 +1137,6 @@
 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 #####################

Modified: jhalfs/trunk/CLFS2/master.sh
===================================================================
--- jhalfs/trunk/CLFS2/master.sh	2006-11-12 12:10:25 UTC (rev 3223)
+++ jhalfs/trunk/CLFS2/master.sh	2006-11-12 13:50:34 UTC (rev 3224)
@@ -467,12 +467,18 @@
 	@touch \$@
 
 SETUP:  $host_prep
+LUSER:  $cross_tools $basicsystem $bootscripttools $bootable
+ROOT:   $chowning
 
-LUSER:	$cross_tools $basicsystem $bootscripttools $bootable
 
-ROOT:	$chowning
+create-sbu_du-report:  ROOT
+	@\$(call echo_message, Building)
+	@if [ "\$(ADD_REPORT)" = "y" ]; then \\
+	  ./create-sbu_du-report.sh logs $VERSION; \\
+	  \$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report); \\
+	fi;
+	@touch  \$@
 
-
 restore-luser-env:
 	@\$(call echo_message, Building)
 	@if [ -f /home/\$(LUSER)/.bashrc.XXX ]; then \\
@@ -495,25 +501,9 @@
 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/trunk/CLFS3/master.sh
===================================================================
--- jhalfs/trunk/CLFS3/master.sh	2006-11-12 12:10:25 UTC (rev 3223)
+++ jhalfs/trunk/CLFS3/master.sh	2006-11-12 13:50:34 UTC (rev 3224)
@@ -460,13 +460,20 @@
 	@sudo make SHELL=/bin/bash ROOT
 	@touch \$@
 
-SETUP:  $host_prep
 
+SETUP:  $host_prep
 LUSER:	$cross_tools $basicsystem $bootscripttools $bootable
-
 ROOT:	$chowning
 
 
+create-sbu_du-report:  ROOT
+	@\$(call echo_message, Building)
+	@if [ "\$(ADD_REPORT)" = "y" ]; then \\
+	  ./create-sbu_du-report.sh logs $VERSION; \\
+	  \$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report); \\
+	fi;
+	@touch  \$@
+
 restore-luser-env:
 	@\$(call echo_message, Building)
 	@if [ -f /home/\$(LUSER)/.bashrc.XXX ]; then \\
@@ -489,21 +496,6 @@
 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/trunk/Config.in
===================================================================
--- jhalfs/trunk/Config.in	2006-11-12 12:10:25 UTC (rev 3223)
+++ jhalfs/trunk/Config.in	2006-11-12 13:50:34 UTC (rev 3224)
@@ -290,8 +290,7 @@
 	config BLFS_TOOL
 		bool	"Add blfs-tool support"
 		default	n
-#		depends on !BOOK_BLFS
-		depends on BOOK_LFS || BOOK_CLFS
+		depends on !BOOK_BLFS && !BOOK_CLFS2 && !BOOK_CLFS3
 		help
 			#--- Activating this option additional packages needed to
 			#    use blfs-tool will be installed.

Modified: jhalfs/trunk/HLFS/master.sh
===================================================================
--- jhalfs/trunk/HLFS/master.sh	2006-11-12 12:10:25 UTC (rev 3223)
+++ jhalfs/trunk/HLFS/master.sh	2006-11-12 13:50:34 UTC (rev 3224)
@@ -522,7 +522,7 @@
 (
   cat << EOF
 
-all:	ck_UID mk_SETUP mk_LUSER mk_SUDO mk_CHROOT mk_BOOT create-sbu_du-report
+all:	ck_UID mk_SETUP mk_LUSER mk_SUDO mk_CHROOT mk_BOOT create-sbu_du-report mk_BLFS_TOOL
 	@sudo make do-housekeeping
 	@\$(call echo_finished,$VERSION)
 
@@ -566,18 +566,31 @@
 	@( sudo \$(CHROOT2) "cd \$(SCRIPT_ROOT) && make BOOT")
 	@touch \$@
 
+mk_BLFS_TOOL: create-sbu_du-report
+	@\$(call echo_PHASE,Building BLFS-TOOLS)
+	@if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
+	  sudo mkdir -p $BUILDDIR$TRACKING_DIR; \\
+	  sudo \$(CHROOT2) "cd \$(SCRIPT_ROOT) && make BLFS_TOOL"; \\
+	fi;
+	@touch \$@
 
-SETUP:	$chapter3
 
-LUSER:	$chapter5
+SETUP:     $chapter3
+LUSER:     $chapter5
+SUDO:      060-kernfs 062-changingowner
+CHROOT:    $chapter6
+BOOT:      $chapter7
+BLFS_TOOL: $blfs_tool
 
-SUDO:	060-kernfs 062-changingowner
 
-CHROOT:	$chapter6
+create-sbu_du-report:  mk_BOOT
+	@\$(call echo_message, Building)
+	@if [ "\$(ADD_REPORT)" = "y" ]; then \\
+	  ./create-sbu_du-report.sh logs $VERSION; \\
+	  \$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report); \\
+	fi;
+	@touch  \$@
 
-BOOT:	$chapter7
-
-
 restore-luser-env:
 	@\$(call echo_message, Building)
 	@if [ -f /home/\$(LUSER)/.bashrc.XXX ]; then \\
@@ -608,21 +621,6 @@
 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/trunk/LFS/master.sh
===================================================================
--- jhalfs/trunk/LFS/master.sh	2006-11-12 12:10:25 UTC (rev 3223)
+++ jhalfs/trunk/LFS/master.sh	2006-11-12 13:50:34 UTC (rev 3224)
@@ -458,18 +458,31 @@
 	@( sudo \$(CHROOT2) "cd \$(SCRIPT_ROOT) && make BOOT")
 	@touch \$@
 
+mk_BLFS_TOOL: create-sbu_du-report
+	@\$(call echo_PHASE,Building BLFS-TOOLS)
+	@if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
+	  sudo mkdir -p $BUILDDIR$TRACKING_DIR; \\
+	  sudo \$(CHROOT2) "cd \$(SCRIPT_ROOT) && make BLFS_TOOL"; \\
+	fi;
+	@touch \$@
 
-SETUP:	$chapter4
 
-LUSER:	$chapter5
+SETUP:     $chapter4
+LUSER:     $chapter5
+SUDO:      057-changingowner 059-kernfs
+CHROOT:    $chapter6
+BOOT:      $chapter789
+BLFS_TOOL: $blfs_tool
 
-SUDO:	057-changingowner 059-kernfs
 
-CHROOT:	$chapter6
+create-sbu_du-report:  mk_BOOT
+	@\$(call echo_message, Building)
+	@if [ "\$(ADD_REPORT)" = "y" ]; then \\
+	  ./create-sbu_du-report.sh logs $VERSION; \\
+	  \$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report); \\
+	fi;
+	@touch  \$@
 
-BOOT:	$chapter789
-
-
 restore-luser-env:
 	@\$(call echo_message, Building)
 	@if [ -f /home/\$(LUSER)/.bashrc.XXX ]; then \\
@@ -499,38 +512,6 @@
 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
-
-  # Add BLFS_TOOL targets
-  echo "mk_BLFS_TOOL:" >> $MKFILE
-  if [[ "$BLFS_TOOL" = "y" ]] ; then
-(
-    cat << EOF
-	@\$(call echo_CHROOT_request)
-	@ sudo mkdir -p $BUILDDIR$TRACKING_DIR
-	@( sudo \$(CHROOT2) "cd \$(SCRIPT_ROOT) && make BLFS_TOOL")
-	@touch \$@
-
-BLFS_TOOL:  $blfs_tool
-
-
-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/trunk/README
===================================================================
--- jhalfs/trunk/README	2006-11-12 12:10:25 UTC (rev 3223)
+++ jhalfs/trunk/README	2006-11-12 13:50:34 UTC (rev 3224)
@@ -81,7 +81,10 @@
 6. BLFS_TOOL SUPPORT::
 
      For books that support it, there is an option to install blfs-tool and its
-     dependendencies on the final system.
+     dependendencies on the final system. The pre-made build dependencies
+     scripts has been written thinking on a LFS build. For CLFS and HLFS
+     builds you may need to adjust that scripts, that are found into the
+     common/blfs-tool-deps directory in the jhalfs sources tree.
 
      After booting the new xLFS system some steps are needed to finish
      blfs-tool installation:

Modified: jhalfs/trunk/common/libs/func_wrt_Makefile
===================================================================
--- jhalfs/trunk/common/libs/func_wrt_Makefile	2006-11-12 12:10:25 UTC (rev 3223)
+++ jhalfs/trunk/common/libs/func_wrt_Makefile	2006-11-12 13:50:34 UTC (rev 3224)
@@ -21,7 +21,6 @@
 LUSER          = $LUSER
 LGROUP         = $LGROUP
 SCRIPT_ROOT    = $SCRIPT_ROOT
-ADD_BLFS_TOOLS = $BLFS_TOOL
 
 BASEDIR        = \$(MOUNT_PT)
 SRCSDIR        = \$(BASEDIR)/sources
@@ -38,6 +37,10 @@
 PRT_DU         = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) --exclude=lost+found \$(MOUNT_PT) \`\n"
 PRT_DU_CR      = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) --exclude=lost+found / \`\n"
 
+ADD_REPORT     = $REPORT
+ADD_BLFS_TOOLS = $BLFS_TOOL
+
+
 export PATH := \${PATH}:/usr/sbin
 
 include makefile-functions




More information about the alfs-log mailing list