r3345 - jhalfs/trunk/CLFS

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Thu Apr 5 11:08:25 PDT 2007


Author: manuel
Date: 2007-04-05 12:08:25 -0600 (Thu, 05 Apr 2007)
New Revision: 3345

Modified:
   jhalfs/trunk/CLFS/master.sh
Log:
Sets chrootttols targets to a separate PREP_CHROOT_JAIL.
That is needed for multilib builds to can load the /root/.bash_profile file generated in 089-flags.
Thanks to Mario Lang for report and patch.

Modified: jhalfs/trunk/CLFS/master.sh
===================================================================
--- jhalfs/trunk/CLFS/master.sh	2007-04-05 17:55:48 UTC (rev 3344)
+++ jhalfs/trunk/CLFS/master.sh	2007-04-05 18:08:25 UTC (rev 3345)
@@ -792,6 +792,7 @@
 mk_SYSTOOLS: mk_SUDO
 	@\$(call echo_CHROOT_request)
 	@\$(call echo_PHASE, CHROOT JAIL )
+	@( sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make BREAKPOINT=\$(BREAKPOINT) PREP_CHROOT_JAIL")
 	@( sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make BREAKPOINT=\$(BREAKPOINT) CHROOT_JAIL")
 	@touch \$@
 
@@ -811,13 +812,15 @@
 	fi;
 	@touch \$@
 
-SETUP:        $host_prep
-AS_LUSER:     $cross_tools $temptools
-SUDO:	      $orphan_scripts
-CHROOT_JAIL:  SHELL=/tools/bin/bash
-CHROOT_JAIL:  ${chroottools} $testsuitetools $basicsystem  $bootscripttools  $bootabletools
-CUSTOM_TOOLS: $custom_list
-BLFS_TOOL:    $blfs_tool
+SETUP:            $host_prep
+AS_LUSER:         $cross_tools $temptools
+SUDO:	          $orphan_scripts
+PREP_CHROOT_JAIL:  SHELL=/tools/bin/bash
+PREP_CHROOT_JAIL: ${chroottools}
+CHROOT_JAIL:       SHELL=/tools/bin/bash
+CHROOT_JAIL:      $testsuitetools $basicsystem  $bootscripttools  $bootabletools
+CUSTOM_TOOLS:     $custom_list
+BLFS_TOOL:        $blfs_tool
 
 
 create-sbu_du-report:  mk_SYSTOOLS




More information about the alfs-log mailing list