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

Had to block custom files from being build in CLFS-sysroot and CLFS-embedded

Browse source
This commit is contained in:
George Boudreau 2007-02-16 00:58:47 +00:00
parent 128a8799a9
commit b4cf3211e8
4 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CLFS/master.sh
View file

@ -924,7 +924,7 @@ 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 echo_PHASE,Building CUSTOM_TOOLS); \\
( source /root/.bash_profile && make CUSTOM_TOOLS"); \\ ( source /root/.bash_profile && make CUSTOM_TOOLS ); \\
fi; fi;
@touch \$@ @touch \$@

10
CLFS2/master.sh
View file

@ -422,7 +422,7 @@ build_Makefile() { # Construct a Makefile from the book scripts
( (
cat << EOF cat << EOF
all: ck_UID mk_SETUP mk_LUSER create-sbu_du-report mk_CUSTOM_TOOLS mk_BLFS_TOOL mk_ROOT all: ck_UID mk_SETUP mk_LUSER create-sbu_du-report mk_ROOT
@sudo make restore-luser-env @sudo make restore-luser-env
@sudo make do-housekeeping @sudo make do-housekeeping
@\$(call echo_finished,$VERSION) @\$(call echo_finished,$VERSION)
@ -446,18 +446,16 @@ mk_LUSER: mk_SETUP
@touch \$@ @touch \$@
mk_CUSTOM_TOOLS: create-sbu_du-report mk_CUSTOM_TOOLS: create-sbu_du-report
@if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\ \$(call echo_PHASE,CUSTOM_TOOLS)
\$(call echo_PHASE,Building CUSTOM_TOOLS); \\ @if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\
\$(call echo_SULUSER_request); \\
(sudo \$(SU_LUSER) "mkdir -p $BUILDDIR$TRACKING_DIR"); \\ (sudo \$(SU_LUSER) "mkdir -p $BUILDDIR$TRACKING_DIR"); \\
(sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make SHELL=/bin/bash CUSTOM_TOOLS"); \\ (sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make SHELL=/bin/bash CUSTOM_TOOLS"); \\
fi; fi;
@touch \$@ @touch \$@
mk_BLFS_TOOL: mk_CUSTOM_TOOLS mk_BLFS_TOOL: mk_CUSTOM_TOOLS
\$(call echo_PHASE,BLFS_TOOL)
@if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\ @if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
\$(call echo_PHASE,Building BLFS_TOOL); \\
\$(call echo_SULUSER_request); \\
(sudo \$(SU_LUSER) "mkdir -p $BUILDDIR$TRACKING_DIR"); \\ (sudo \$(SU_LUSER) "mkdir -p $BUILDDIR$TRACKING_DIR"); \\
(sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make SHELL=/bin/bash BLFS_TOOL"); \\ (sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make SHELL=/bin/bash BLFS_TOOL"); \\
fi; fi;

7
CLFS3/master.sh
View file

@ -475,7 +475,7 @@ build_Makefile() { # Construct a Makefile from the book scripts
( (
cat << EOF cat << EOF
all: ck_UID mk_SETUP mk_LUSER create-sbu_du-report mk_CUSTOM_TOOLS mk_ROOT all: ck_UID mk_SETUP mk_LUSER create-sbu_du-report
@sudo make restore-luser-env @sudo make restore-luser-env
@sudo make do-housekeeping @sudo make do-housekeeping
@\$(call echo_finished,$VERSION) @\$(call echo_finished,$VERSION)
@ -499,9 +499,8 @@ mk_LUSER: mk_SETUP
@touch \$@ @touch \$@
mk_CUSTOM_TOOLS: create-sbu_du-report mk_CUSTOM_TOOLS: create-sbu_du-report
@if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\ \$(call echo_PHASE,Building CUSTOM_TOOLS);
\$(call echo_PHASE,Building CUSTOM_TOOLS); \\ @if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\
\$(call echo_SULUSER_request); \\
(sudo \$(SU_LUSER) "mkdir -p $BUILDDIR$TRACKING_DIR"); \\ (sudo \$(SU_LUSER) "mkdir -p $BUILDDIR$TRACKING_DIR"); \\
(sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make SHELL=/bin/bash CUSTOM_TOOLS"); \\ (sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make SHELL=/bin/bash CUSTOM_TOOLS"); \\
fi; fi;

6
LFS/master.sh
View file

@ -461,18 +461,16 @@ mk_BOOT: mk_CHROOT
@touch \$@ @touch \$@
mk_CUSTOM_TOOLS: create-sbu_du-report mk_CUSTOM_TOOLS: create-sbu_du-report
\$(call echo_PHASE,Building CUSTOM_TOOLS)
@if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\ @if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\
\$(call echo_PHASE,Building CUSTOM_TOOLS); \\
\$(call 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;
@touch \$@ @touch \$@
mk_BLFS_TOOL: mk_CUSTOM_TOOLS mk_BLFS_TOOL: mk_CUSTOM_TOOLS
\$(call echo_PHASE,Building BLFS_TOOL)
@if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\ @if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
\$(call echo_PHASE,Building BLFS_TOOL); \\
\$(call 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;