r3746 - jhalfs/trunk/CLFS

pierre at higgs.linuxfromscratch.org pierre at higgs.linuxfromscratch.org
Fri Nov 1 13:47:42 PDT 2013


Author: pierre
Date: Fri Nov  1 13:47:42 2013
New Revision: 3746

Log:
Change SU_LUSER commands in CLFS for being able to interrupt
the build in the cross-tools and temptools phase

Modified:
   jhalfs/trunk/CLFS/master.sh

Modified: jhalfs/trunk/CLFS/master.sh
==============================================================================
--- jhalfs/trunk/CLFS/master.sh	Fri Nov  1 07:25:30 2013	(r3745)
+++ jhalfs/trunk/CLFS/master.sh	Fri Nov  1 13:47:42 2013	(r3746)
@@ -845,17 +845,11 @@
 #--------------------------------------#
 build_Makefile() {                     # Construct a Makefile from the book scripts
 #--------------------------------------#
-  #
-  # Script crashes if error trapping is on
-  #
-set +e
-  declare -f  method_cmds
-set -e
 
   echo "...Creating Makefile... ${BOLD}START${OFF}"
 
   cd $JHALFSDIR/${PROGNAME}-commands
-  # Start with a clean files
+  # Start with clean files
   >$MKFILE
   >$MKFILE.tmp
 
@@ -935,7 +929,7 @@
 #---------------AS LUSER
 mk_CROSS: mk_SETUP
 	@\$(call echo_PHASE,Cross and Temporary Tools)
-	@(sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make BREAKPOINT=\$(BREAKPOINT) AS_LUSER" )
+	@( \$(SU_LUSER) "make -C \$(MOUNT_PT)/\$(SCRIPT_ROOT) BREAKPOINT=\$(BREAKPOINT) AS_LUSER" )
 	@sudo make restore-luser-env
 	@touch \$@
 
@@ -1026,7 +1020,7 @@
 	  echo "|However, if this is the boot environment          |"; \\
 	  echo "| the command you are looking for is               |"; \\
 	  echo "|   make makesys                                   |"; \\
-	  echo "| to finish off the build                          |"; \\
+	  echo "| to complete the build                            |"; \\
 	  echo "+--------------------------------------------------+"; \\
 	  exit 1; \\
 	fi
@@ -1042,7 +1036,7 @@
 
 mk_CROSS: mk_SETUP
 	@\$(call echo_PHASE,Cross Tool)
-	@(sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make BREAKPOINT=\$(BREAKPOINT) AS_LUSER" )
+	@( \$(SU_LUSER) "make -C \$(MOUNT_PT)/\$(SCRIPT_ROOT) BREAKPOINT=\$(BREAKPOINT) AS_LUSER" )
 	@touch \$@
 
 mk_SUDO: mk_CROSS



More information about the alfs-log mailing list