Changeset 730436a for CLFS

Timestamp:

11/01/2013 08:47:42 PM (11 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

2.4, ablfs-more, legacy, new_features, trunk

Children:

269d81c

Parents:

a0dbe0a

Message:

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

File:

• CLFS/master.sh (modified) (4 diffs)

CLFS/master.sh

@@ -846 +846 @@
 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
@@ -936 +930 @@
 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 \$@
@@ -1027 +1021 @@
           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; \\
@@ -1043 +1037 @@
 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 \$@