r2812 - jhalfs/trunk/CLFS

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Sun Jul 2 02:24:48 PDT 2006


Author: manuel
Date: 2006-07-02 03:24:47 -0600 (Sun, 02 Jul 2006)
New Revision: 2812

Modified:
   jhalfs/trunk/CLFS/master.sh
Log:
Renamed CLFS envars.

Modified: jhalfs/trunk/CLFS/master.sh
===================================================================
--- jhalfs/trunk/CLFS/master.sh	2006-06-29 01:47:35 UTC (rev 2811)
+++ jhalfs/trunk/CLFS/master.sh	2006-07-02 09:24:47 UTC (rev 2812)
@@ -10,12 +10,12 @@
 #----------------------------#
 host_prep_Makefiles() {      # Initialization of the system
 #----------------------------#
-  local   LFS_HOST
+  local   CLFS_HOST
 
   echo "${tab_}${GREEN}Processing... ${L_arrow}host prep files${R_arrow}"
 
   # defined here, only for ease of reading
-  LFS_HOST="`echo ${MACHTYPE} | sed -e 's/unknown/cross/g' -e 's/-pc-/-cross-/g'`"
+  CLFS_HOST="`echo ${MACHTYPE} | sed -e 's/unknown/cross/g' -e 's/-pc-/-cross-/g'`"
 (
 cat << EOF
 023-creatingtoolsdir:
@@ -65,17 +65,17 @@
 	fi;
 	@echo "set +h" > /home/lfs/.bashrc && \\
 	echo "umask 022" >> /home/lfs/.bashrc && \\
-	echo "LFS=\$(MOUNT_PT)" >> /home/lfs/.bashrc && \\
+	echo "CLFS=\$(MOUNT_PT)" >> /home/lfs/.bashrc && \\
 	echo "LC_ALL=POSIX" >> /home/lfs/.bashrc && \\
 	echo "PATH=/cross-tools/bin:/bin:/usr/bin" >> /home/lfs/.bashrc && \\
-	echo "export LFS LC_ALL PATH" >> /home/lfs/.bashrc && \\
+	echo "export CLFS LC_ALL PATH" >> /home/lfs/.bashrc && \\
 	echo "" >> /home/lfs/.bashrc && \\
 	echo "unset CFLAGS" >> /home/lfs/.bashrc && \\
 	echo "unset CXXFLAGS" >> /home/lfs/.bashrc && \\
 	echo "" >> /home/lfs/.bashrc && \\
-	echo "export LFS_HOST=\"${LFS_HOST}\"" >> /home/lfs/.bashrc && \\
-	echo "export LFS_TARGET=\"${TARGET}\"" >> /home/lfs/.bashrc && \\
-	echo "export LFS_TARGET32=\"${TARGET32}\"" >> /home/lfs/.bashrc && \\
+	echo "export CLFS_HOST=\"${CLFS_HOST}\"" >> /home/lfs/.bashrc && \\
+	echo "export CLFS_TARGET=\"${TARGET}\"" >> /home/lfs/.bashrc && \\
+	echo "export CLFS_TARGET32=\"${TARGET32}\"" >> /home/lfs/.bashrc && \\
 	echo "source $JHALFSDIR/envars" >> /home/lfs/.bashrc
 	@chown lfs:lfs /home/lfs/.bashrc && \\
 	touch envars && \\
@@ -167,7 +167,7 @@
          [[ $METHOD = "boot" ]] && continue; ;;
       *) ;;
     esac
-    
+
     #
     # First append each name of the script files to a list (this will become
     # the names of the targets in the Makefile
@@ -1027,7 +1027,7 @@
                                                                 -e 's|\\$|&&|g' \
                                                                 -e 's|exit||g' \
                                                                 -e 's|$| -c|' \
-                                                                -e 's|"$$LFS"|$(MOUNT_PT)|'\
+                                                                -e 's|"$$CLFS"|$(MOUNT_PT)|'\
                                                                 -e 's|set -e||'`
     echo -e "CHROOT1= $chroot\n" >> $MKFILE
   fi




More information about the alfs-log mailing list