Changeset b4cf321

Timestamp:

02/16/2007 12:58:47 AM (17 years ago)

Author:

George Boudreau <georgeb@…>

Branches:

2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk

Children:

dcf0e25

Parents:

128a879

Message:

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

Files:

• CLFS/master.sh (modified) (1 diff)
• CLFS2/master.sh (modified) (3 diffs)
• CLFS3/master.sh (modified) (2 diffs)
• LFS/master.sh (modified) (2 diffs)

CLFS/master.sh

@@ -925 +925 @@
           mkdir -p ${TRACKING_DIR}; \\
           \$(call echo_PHASE,Building CUSTOM_TOOLS); \\
-          ( source /root/.bash_profile && make CUSTOM_TOOLS"); \\
+          ( source /root/.bash_profile && make CUSTOM_TOOLS ); \\
         fi;
         @touch \$@

CLFS2/master.sh

@@ -423 +423 @@
 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 do-housekeeping
@@ -447 +447 @@
 
 mk_CUSTOM_TOOLS: create-sbu_du-report
-        @if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
-          \$(call echo_PHASE,Building CUSTOM_TOOLS); \\
-          \$(call echo_SULUSER_request); \\
+        \$(call echo_PHASE,CUSTOM_TOOLS)
+        @if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\
           (sudo \$(SU_LUSER) "mkdir -p $BUILDDIR$TRACKING_DIR"); \\
           (sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make SHELL=/bin/bash CUSTOM_TOOLS"); \\
@@ -456 +455 @@
 
 mk_BLFS_TOOL: mk_CUSTOM_TOOLS
+        \$(call echo_PHASE,BLFS_TOOL)
         @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) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make SHELL=/bin/bash BLFS_TOOL"); \\

CLFS3/master.sh

@@ -476 +476 @@
 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 do-housekeeping
@@ -500 +500 @@
 
 mk_CUSTOM_TOOLS: create-sbu_du-report
-        @if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
-          \$(call echo_PHASE,Building CUSTOM_TOOLS); \\
-          \$(call echo_SULUSER_request); \\
+        \$(call echo_PHASE,Building CUSTOM_TOOLS);
+        @if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\
           (sudo \$(SU_LUSER) "mkdir -p $BUILDDIR$TRACKING_DIR"); \\
           (sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make SHELL=/bin/bash CUSTOM_TOOLS"); \\

LFS/master.sh

@@ -462 +462 @@
 
 mk_CUSTOM_TOOLS: create-sbu_du-report
+        \$(call echo_PHASE,Building CUSTOM_TOOLS)
         @if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\
-          \$(call echo_PHASE,Building CUSTOM_TOOLS); \\
-          \$(call echo_CHROOT_request); \\
           sudo mkdir -p ${BUILDDIR}${TRACKING_DIR}; \\
           (sudo \$(CHROOT2) "cd \$(SCRIPT_ROOT) && make CUSTOM_TOOLS"); \\
@@ -471 +470 @@
 
 mk_BLFS_TOOL: mk_CUSTOM_TOOLS
+        \$(call echo_PHASE,Building BLFS_TOOL)
         @if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
-          \$(call echo_PHASE,Building BLFS_TOOL); \\
-          \$(call echo_CHROOT_request); \\
           sudo mkdir -p $BUILDDIR$TRACKING_DIR; \\
           (sudo \$(CHROOT2) "cd \$(SCRIPT_ROOT) && make BLFS_TOOL"); \\