r2740 - in jhalfs/trunk: . common

georgeb at linuxfromscratch.org georgeb at linuxfromscratch.org
Thu Jun 1 13:49:42 PDT 2006


Author: georgeb
Date: 2006-06-01 14:49:41 -0600 (Thu, 01 Jun 2006)
New Revision: 2740

Modified:
   jhalfs/trunk/common/common-functions
   jhalfs/trunk/common/func_compare.sh
   jhalfs/trunk/master.sh
Log:
jhalfs directory usage has been replaced by 

Modified: jhalfs/trunk/common/common-functions
===================================================================
--- jhalfs/trunk/common/common-functions	2006-06-01 19:52:44 UTC (rev 2739)
+++ jhalfs/trunk/common/common-functions	2006-06-01 20:49:41 UTC (rev 2740)
@@ -57,7 +57,7 @@
 
 ${BOLD}  -D  --directory DIR${OFF}
         use DIR directory for building ${BOLD}$(echo $PROGNAME | tr [a-z] [A-Z])${OFF}; all files jhalfs produces
-        will be in the directory DIR/jhalfs.
+        will be in the directory DIR/${SCRIPT_ROOT}.
         The current setting for BUILDDIR is "$BUILDDIR"
 
 ${BOLD}  -G, --get-packages${OFF}
@@ -202,7 +202,7 @@
 $i:  $PREV
 	@\$(call echo_message, Building)
 	@./progress_bar.sh \$@ \$(MAKE_PID) &
-	@echo -e "\n\`date\`\n\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n" >logs/$LOGFILE
+	@echo -e "\n\`date\`\n\nKB: \`du -skx --exclude=${SCRIPT_ROOT} \$(MOUNT_PT)\`\n" >logs/$LOGFILE
 EOF
 ) >> $MKFILE.tmp
 }
@@ -322,7 +322,7 @@
 (
 cat << EOF
 	@( time { su - lfs -c "source /home/lfs/.bashrc && $JHALFSDIR/${PROGNAME}-commands/$file" >>logs/$this_script 2>&1 ; } ) 2>>logs/$this_script && \\
-	echo -e "\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n" >>logs/$this_script
+	echo -e "\nKB: \`du -skx --exclude=${SCRIPT_ROOT} \$(MOUNT_PT)\`\n" >>logs/$this_script
 EOF
 ) >> $MKFILE.tmp
 }
@@ -336,7 +336,7 @@
 (
 cat << EOF
 	@( time { export LFS=\$(MOUNT_PT) && ${PROGNAME}-commands/$file >>logs/$this_script 2>&1 ; } ) 2>>logs/$this_script && \\
-	echo -e "\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n" >>logs/$this_script
+	echo -e "\nKB: \`du -skx --exclude=${SCRIPT_ROOT} \$(MOUNT_PT)\`\n" >>logs/$this_script
 EOF
 ) >> $MKFILE.tmp
 }
@@ -350,7 +350,7 @@
 (
 cat << EOF
 	@( time { source envars && ${PROGNAME}-commands/$file >>logs/$this_script 2>&1 ; } ) 2>>logs/$this_script && \\
-	echo -e "\nKB: \`du -skx --exclude=jhalfs \`\n" >>logs/$this_script
+	echo -e "\nKB: \`du -skx --exclude=${SCRIPT_ROOT} \`\n" >>logs/$this_script
 EOF
 ) >> $MKFILE.tmp
 }
@@ -364,8 +364,8 @@
   local file=$2
 (
     cat << EOF
-	@( time { \$(CHROOT1) 'cd /jhalfs && source envars && /jhalfs/${PROGNAME}-commands/$file >>/jhalfs/logs/${this_script} 2>&1' ; } ) 2>>logs/$this_script && \\
-	echo -e "\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n" >>logs/${this_script}
+	@( time { \$(CHROOT1) 'cd /${SCRIPT_ROOT} && source envars && /${SCRIPT_ROOT}/${PROGNAME}-commands/$file >>/${SCRIPT_ROOT}/logs/${this_script} 2>&1' ; } ) 2>>logs/$this_script && \\
+	echo -e "\nKB: \`du -skx --exclude=${SCRIPT_ROOT} \$(MOUNT_PT)\`\n" >>logs/${this_script}
 EOF
 ) >> $MKFILE.tmp
 }
@@ -378,8 +378,8 @@
   local file=$2
 (
 cat << EOF
-	@( time { \$(CHROOT2) 'cd /jhalfs && source envars && /jhalfs/${PROGNAME}-commands/$file >>/jhalfs/logs/${this_script} 2>&1' ; } ) 2>>logs/$this_script && \\
-	echo -e "\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n" >>logs/${this_script}
+	@( time { \$(CHROOT2) 'cd /${SCRIPT_ROOT} && source envars && /${SCRIPT_ROOT}/${PROGNAME}-commands/$file >>/${SCRIPT_ROOT}/logs/${this_script} 2>&1' ; } ) 2>>logs/$this_script && \\
+	echo -e "\nKB: \`du -skx --exclude=${SCRIPT_ROOT} \$(MOUNT_PT)\`\n" >>logs/${this_script}
 EOF
 ) >> $MKFILE.tmp
 }

Modified: jhalfs/trunk/common/func_compare.sh
===================================================================
--- jhalfs/trunk/common/func_compare.sh	2006-06-01 19:52:44 UTC (rev 2739)
+++ jhalfs/trunk/common/func_compare.sh	2006-06-01 20:49:41 UTC (rev 2740)
@@ -43,17 +43,17 @@
 #----------------------------------#
   local ITERATION=$1
   local   PREV_IT=$2
-  local PRUNEPATH="/dev /home /jhalfs /lost+found /media /mnt /opt /proc \
+  local PRUNEPATH="/dev /home /${SCRIPT_ROOT} /lost+found /media /mnt /opt /proc \
 /sources /root /srv /sys /tmp /tools /usr/local /usr/src /var/log/paco"
 
   if [[ "$PROGNAME" = "clfs" ]] && [[ "$METHOD" = "boot" ]] ; then
     local    ROOT_DIR=/
-    local DEST_TOPDIR=/jhalfs
-    local   ICALOGDIR=/jhalfs/logs/ICA
-    local FARCELOGDIR=/jhalfs/logs/farce
+    local DEST_TOPDIR=/${SCRIPT_ROOT}
+    local   ICALOGDIR=/${SCRIPT_ROOT}/logs/ICA
+    local FARCELOGDIR=/${SCRIPT_ROOT}/logs/farce
   else
     local    ROOT_DIR=$BUILDDIR
-    local DEST_TOPDIR=$BUILDDIR/jhalfs
+    local DEST_TOPDIR=$BUILDDIR/${SCRIPT_ROOT}
   fi
 
   if [[ "$RUN_ICA" = "1" ]] ; then

Modified: jhalfs/trunk/master.sh
===================================================================
--- jhalfs/trunk/master.sh	2006-06-01 19:52:44 UTC (rev 2739)
+++ jhalfs/trunk/master.sh	2006-06-01 20:49:41 UTC (rev 2740)
@@ -136,7 +136,7 @@
           ;;
         * )
           BUILDDIR=$1
-          JHALFSDIR=$BUILDDIR/jhalfs
+          JHALFSDIR=$BUILDDIR/${SCRIPT_ROOT}
           LOGDIR=$JHALFSDIR/logs
           MKFILE=$JHALFSDIR/Makefile
           ;;




More information about the alfs-log mailing list