zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Change SU_LUSER commands in CLFS for being able to interrupt

Browse source 
the build in the cross-tools and temptools phase
This commit is contained in:
Pierre Labastie 2013-11-01 20:47:42 +00:00
parent a0dbe0a19b
commit 730436a1f2
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
CLFS/master.sh
View file

@ -845,17 +845,11 @@ bootable_Makefiles() { #
#--------------------------------------# #--------------------------------------#
build_Makefile() { # Construct a Makefile from the book scripts 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}" echo "...Creating Makefile... ${BOLD}START${OFF}"
cd $JHALFSDIR/${PROGNAME}-commands cd $JHALFSDIR/${PROGNAME}-commands
# Start with a clean files # Start with clean files
>$MKFILE >$MKFILE
>$MKFILE.tmp >$MKFILE.tmp
@ -935,7 +929,7 @@ mk_SETUP:
#---------------AS LUSER #---------------AS LUSER
mk_CROSS: mk_SETUP mk_CROSS: mk_SETUP
@\$(call echo_PHASE,Cross and Temporary Tools) @\$(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 @sudo make restore-luser-env
@touch \$@ @touch \$@
@ -1026,7 +1020,7 @@ ck_UID:
echo "|However, if this is the boot environment |"; \\ echo "|However, if this is the boot environment |"; \\
echo "| the command you are looking for is |"; \\ echo "| the command you are looking for is |"; \\
echo "| make makesys |"; \\ echo "| make makesys |"; \\
echo "| to finish off the build |"; \\ echo "| to complete the build |"; \\
echo "+--------------------------------------------------+"; \\ echo "+--------------------------------------------------+"; \\
exit 1; \\ exit 1; \\
fi fi
@ -1042,7 +1036,7 @@ mk_SETUP:
mk_CROSS: mk_SETUP mk_CROSS: mk_SETUP
@\$(call echo_PHASE,Cross Tool) @\$(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 \$@ @touch \$@
mk_SUDO: mk_CROSS mk_SUDO: mk_CROSS