Changeset 3f83cb0 for CLFS/master.sh

Timestamp:

05/31/2014 06:57:41 AM (10 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

2.4, ablfs-more, legacy, new_features, trunk

Children:

f0de954

Parents:

659be15

Message:

For CLFS 3.0, variable setting is now in final-prep chapter.
Adapt CLFS for that

File:

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

CLFS/master.sh

@@ -65 +65 @@
         echo "unset CXXFLAGS" >> \$(LUSER_HOME)/.bashrc && \\
         echo "" >> \$(LUSER_HOME)/.bashrc && \\
+EOF
+) >> $MKFILE.tmp
+if ! [ -e final-preps/*variables ]; then
+  (
+  cat << EOF
         echo "export CLFS_HOST=\"${CLFS_HOST}\"" >> \$(LUSER_HOME)/.bashrc && \\
         echo "export CLFS_TARGET=\"${TARGET}\"" >> \$(LUSER_HOME)/.bashrc && \\
         echo "export CLFS_TARGET32=\"${TARGET32}\"" >> \$(LUSER_HOME)/.bashrc && \\
+EOF
+  ) >> $MKFILE.tmp
+fi
+(
+cat << EOF
         echo "source $JHALFSDIR/envars" >> \$(LUSER_HOME)/.bashrc
         @chown \$(LUSER):\$(LGROUP) \$(LUSER_HOME)/.bashrc && \\
@@ -81 +91 @@
   host_prep=" 023-creatingtoolsdir 024-creatingcrossdir 026-settingenvironment"
 
+}
+
+#--------------------------------------#
+final_preps_Makefiles() {
+#--------------------------------------#
+  echo "${tab_}${GREEN}Processing... ${L_arrow}variables  ( LUSER ) ${R_arrow}"
+  for file in final-preps/* ; do
+    this_script=`basename $file`
+    case $this_script in
+      *variables )
+         ;;
+      *) continue; ;;
+    esac
+    # Set the dependency for the first target.
+    if [ -z $PREV ] ; then PREV=026-settingenvironment ; fi
+
+    # First append each name of the script files to a list (this will become
+    # the names of the targets in the Makefile
+    final_preps="$final_preps $this_script"
+
+    # No need to grab the package name
+
+    LUSER_wrt_target "${this_script}" "$PREV"
+    LUSER_wrt_RunAsUser "${file}"
+    wrt_touch
+    PREV=$this_script
+  done # for file in ....
 }
 
@@ -947 +984 @@
 
   host_prep_Makefiles        # mk_SETUP      (SETUP)  $host_prep
+  final_preps_Makefiles      # mk_F_PREPS    (LUSER)  $final_preps
   cross_tools_Makefiles      # mk_CROSS      (LUSER)  $cross_tools
   temptools_Makefiles        # mk_TEMP       (LUSER)  $temptools
@@ -995 +1033 @@
 cat << EOF
 
-all: ck_UID mk_SETUP mk_CROSS mk_SUDO mk_SYSTOOLS create-sbu_du-report mk_CUSTOM_TOOLS mk_BLFS_TOOL
+all: ck_UID mk_SETUP mk_F_PREPS mk_SUDO mk_SYSTOOLS create-sbu_du-report mk_CUSTOM_TOOLS mk_BLFS_TOOL
         @sudo make do-housekeeping
         @echo "$VERSION - jhalfs build" > clfs-release && \\
@@ -1017 +1055 @@
 
 #---------------AS LUSER
-mk_CROSS: mk_SETUP
-        @\$(call echo_PHASE,Cross and Temporary Tools)
+mk_F_PREPS: mk_SETUP
+        @\$(call echo_PHASE,Final Preparations Cross and Temporary Tools)
         @( \$(SU_LUSER) "make -C \$(MOUNT_PT)/\$(SCRIPT_ROOT) BREAKPOINT=\$(BREAKPOINT) AS_LUSER" )
         @sudo make restore-luser-env
         @touch \$@
 
-mk_SUDO: mk_CROSS
+mk_SUDO: mk_F_PREPS
         @sudo make BREAKPOINT=\$(BREAKPOINT) SUDO
         @touch \$@
@@ -1051 +1089 @@
 
 SETUP:            $host_prep
-AS_LUSER:         $cross_tools $temptools
+AS_LUSER:         $final_preps $cross_tools $temptools
 SUDO:             $orphan_scripts
 PREP_CHROOT_JAIL:  SHELL=/tools/bin/bash
@@ -1097 +1135 @@
 cat << EOF
 
-all:    ck_UID mk_SETUP mk_CROSS mk_SUDO
+all:    ck_UID mk_SETUP mk_F_PREPS mk_SUDO
         @sudo make restore-luser-env
         @sudo make do-housekeeping
@@ -1128 +1166 @@
 #---------------AS LUSER
 
-mk_CROSS: mk_SETUP
-        @\$(call echo_PHASE,Cross Tool)
+mk_F_PREPS: mk_SETUP
+        @\$(call echo_PHASE,Final Preparations and Cross Tools)
         @( \$(SU_LUSER) "make -C \$(MOUNT_PT)/\$(SCRIPT_ROOT) BREAKPOINT=\$(BREAKPOINT) AS_LUSER" )
         @touch \$@
 
-mk_SUDO: mk_CROSS
+mk_SUDO: mk_F_PREPS
         @sudo make BREAKPOINT=\$(BREAKPOINT) SUDO
         @touch \$@
@@ -1160 +1198 @@
 
 SETUP:        $host_prep
-AS_LUSER:     $cross_tools $temptools ${boottools}
+AS_LUSER:     $final_preps $cross_tools $temptools ${boottools}
 SUDO:         $orphan_scripts
 AS_ROOT:      SHELL=/tools/bin/bash