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

added function to file makefile_functions and added call in HLFS and CLFS master.sh

Browse source
This commit is contained in:
George Boudreau 2007-03-02 00:09:55 +00:00
parent b230bd6f0a
commit 79da2977ad
3 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
CLFS/master.sh
View file

@ -805,8 +805,8 @@ mk_SYSTOOLS: mk_SUDO
mk_CUSTOM_TOOLS: create-sbu_du-report mk_CUSTOM_TOOLS: create-sbu_du-report
@if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\ @if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\
\$(call echo_PHASE,Building CUSTOM_TOOLS); \\ \$(call sh_echo_PHASE,Building CUSTOM_TOOLS); \\
\$(call echo_CHROOT_request); \\ \$(call sh_echo_CHROOT_request); \\
sudo mkdir -p ${BUILDDIR}${TRACKING_DIR}; \\ sudo mkdir -p ${BUILDDIR}${TRACKING_DIR}; \\
(sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make CUSTOM_TOOLS"); \\ (sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make CUSTOM_TOOLS"); \\
fi; fi;
@ -814,8 +814,8 @@ mk_CUSTOM_TOOLS: create-sbu_du-report
mk_BLFS_TOOL: mk_CUSTOM_TOOLS mk_BLFS_TOOL: mk_CUSTOM_TOOLS
@if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\ @if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
\$(call echo_PHASE,Building BLFS_TOOL); \\ \$(call sh_echo_PHASE,Building BLFS_TOOL); \\
\$(call echo_CHROOT_request); \\ \$(call sh_echo_CHROOT_request); \\
sudo mkdir -p $BUILDDIR$TRACKING_DIR; \\ sudo mkdir -p $BUILDDIR$TRACKING_DIR; \\
sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make BLFS_TOOL"; \\ sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make BLFS_TOOL"; \\
fi; fi;
@ -911,7 +911,7 @@ mk_FINAL:
mk_CUSTOM_TOOLS: mk_FINAL mk_CUSTOM_TOOLS: mk_FINAL
@if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\ @if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\
mkdir -p ${TRACKING_DIR}; \\ mkdir -p ${TRACKING_DIR}; \\
\$(call echo_PHASE,Building CUSTOM_TOOLS); \\ \$(call sh_echo_PHASE,Building CUSTOM_TOOLS); \\
( source /root/.bash_profile && make CUSTOM_TOOLS ); \\ ( source /root/.bash_profile && make CUSTOM_TOOLS ); \\
fi; fi;
@touch \$@ @touch \$@
@ -919,7 +919,7 @@ mk_CUSTOM_TOOLS: mk_FINAL
mk_BLFS_TOOL: mk_CUSTOM_TOOLS mk_BLFS_TOOL: mk_CUSTOM_TOOLS
@if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\ @if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
mkdir -p $TRACKING_DIR; \\ mkdir -p $TRACKING_DIR; \\
\$(call echo_PHASE,Building BLFS_TOOL); \\ \$(call sh_echo_PHASE,Building BLFS_TOOL); \\
( source /root/.bash_profile && make BLFS_TOOL ); \\ ( source /root/.bash_profile && make BLFS_TOOL ); \\
fi fi
@touch \$@ @touch \$@

8
HLFS/master.sh
View file

@ -577,8 +577,8 @@ mk_BOOT: mk_CHROOT
mk_CUSTOM_TOOLS: create-sbu_du-report mk_CUSTOM_TOOLS: create-sbu_du-report
@if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\ @if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\
\$(call echo_PHASE,Building CUSTOM_TOOLS); \\ \$(call sh_echo_PHASE,Building CUSTOM_TOOLS); \\
\$(call echo_CHROOT_request); \\ \$(call sh_echo_CHROOT_request); \\
sudo mkdir -p ${BUILDDIR}${TRACKING_DIR}; \\ sudo mkdir -p ${BUILDDIR}${TRACKING_DIR}; \\
(sudo \$(CHROOT2) "cd \$(SCRIPT_ROOT) && make CUSTOM_TOOLS"); \\ (sudo \$(CHROOT2) "cd \$(SCRIPT_ROOT) && make CUSTOM_TOOLS"); \\
fi; fi;
@ -586,8 +586,8 @@ mk_CUSTOM_TOOLS: create-sbu_du-report
mk_BLFS_TOOL: mk_CUSTOM_TOOLS mk_BLFS_TOOL: mk_CUSTOM_TOOLS
@if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\ @if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
\$(call echo_PHASE,Building BLFS_TOOL); \\ \$(call sh_echo_PHASE,Building BLFS_TOOL); \\
\$(call echo_CHROOT_request); \\ \$(call sh_echo_CHROOT_request); \\
sudo mkdir -p $BUILDDIR$TRACKING_DIR; \\ sudo mkdir -p $BUILDDIR$TRACKING_DIR; \\
(sudo \$(CHROOT2) "cd \$(SCRIPT_ROOT) && make BLFS_TOOL"); \\ (sudo \$(CHROOT2) "cd \$(SCRIPT_ROOT) && make BLFS_TOOL"); \\
fi; fi;

6
common/makefile-functions
View file

@ -24,6 +24,12 @@ define echo_PHASE
@echo $(WHITE) @echo $(WHITE)
endef endef
define sh_echo_PHASE
echo $(BOLD)--------------------------------------------------------------------------------;\
echo $(tab_)$(tab_)Executing $(BLUE)$(1)$(WHITE) scripts; \
echo $(BOLD)--------------------------------------------------------------------------------echo $(WHITE)
endef
define echo_SU_request define echo_SU_request
@echo $(BOLD)-------------------------------------------------------------------------------- @echo $(BOLD)--------------------------------------------------------------------------------
@echo $(BLUE)$@ @echo $(BLUE)$@