Changeset 1a1f099


Ignore:
Timestamp:
06/01/2006 08:49:41 PM (18 years ago)
Author:
George Boudreau <georgeb@…>
Branches:
1.0, 2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk
Children:
a36805d
Parents:
3b3251a
Message:

jhalfs directory usage has been replaced by

Files:
3 edited

Legend:

Unmodified
Added
Removed

  • common/common-functions

    r3b3251a r1a1f099  
    5858${BOLD}  -D  --directory DIR${OFF}
    5959        use DIR directory for building ${BOLD}$(echo $PROGNAME | tr [a-z] [A-Z])${OFF}; all files jhalfs produces
    60         will be in the directory DIR/jhalfs.
     60        will be in the directory DIR/${SCRIPT_ROOT}.
    6161        The current setting for BUILDDIR is "$BUILDDIR"
    6262
    … …  
    203203        @\$(call echo_message, Building)
    204204        @./progress_bar.sh \$@ \$(MAKE_PID) &
    205         @echo -e "\n\`date\`\n\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n" >logs/$LOGFILE
     205        @echo -e "\n\`date\`\n\nKB: \`du -skx --exclude=${SCRIPT_ROOT} \$(MOUNT_PT)\`\n" >logs/$LOGFILE
    206206EOF
    207207) >> $MKFILE.tmp
    … …  
    323323cat << EOF
    324324        @( time { su - lfs -c "source /home/lfs/.bashrc && $JHALFSDIR/${PROGNAME}-commands/$file" >>logs/$this_script 2>&1 ; } ) 2>>logs/$this_script && \\
    325         echo -e "\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n" >>logs/$this_script
     325        echo -e "\nKB: \`du -skx --exclude=${SCRIPT_ROOT} \$(MOUNT_PT)\`\n" >>logs/$this_script
    326326EOF
    327327) >> $MKFILE.tmp
    … …  
    337337cat << EOF
    338338        @( time { export LFS=\$(MOUNT_PT) && ${PROGNAME}-commands/$file >>logs/$this_script 2>&1 ; } ) 2>>logs/$this_script && \\
    339         echo -e "\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n" >>logs/$this_script
     339        echo -e "\nKB: \`du -skx --exclude=${SCRIPT_ROOT} \$(MOUNT_PT)\`\n" >>logs/$this_script
    340340EOF
    341341) >> $MKFILE.tmp
    … …  
    351351cat << EOF
    352352        @( time { source envars && ${PROGNAME}-commands/$file >>logs/$this_script 2>&1 ; } ) 2>>logs/$this_script && \\
    353         echo -e "\nKB: \`du -skx --exclude=jhalfs \`\n" >>logs/$this_script
     353        echo -e "\nKB: \`du -skx --exclude=${SCRIPT_ROOT} \`\n" >>logs/$this_script
    354354EOF
    355355) >> $MKFILE.tmp
    … …  
    365365(
    366366    cat << EOF
    367         @( time { \$(CHROOT1) 'cd /jhalfs && source envars && /jhalfs/${PROGNAME}-commands/$file >>/jhalfs/logs/${this_script} 2>&1' ; } ) 2>>logs/$this_script && \\
    368         echo -e "\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n" >>logs/${this_script}
     367        @( time { \$(CHROOT1) 'cd /${SCRIPT_ROOT} && source envars && /${SCRIPT_ROOT}/${PROGNAME}-commands/$file >>/${SCRIPT_ROOT}/logs/${this_script} 2>&1' ; } ) 2>>logs/$this_script && \\
     368        echo -e "\nKB: \`du -skx --exclude=${SCRIPT_ROOT} \$(MOUNT_PT)\`\n" >>logs/${this_script}
    369369EOF
    370370) >> $MKFILE.tmp
    … …  
    379379(
    380380cat << EOF
    381         @( time { \$(CHROOT2) 'cd /jhalfs && source envars && /jhalfs/${PROGNAME}-commands/$file >>/jhalfs/logs/${this_script} 2>&1' ; } ) 2>>logs/$this_script && \\
    382         echo -e "\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n" >>logs/${this_script}
     381        @( time { \$(CHROOT2) 'cd /${SCRIPT_ROOT} && source envars && /${SCRIPT_ROOT}/${PROGNAME}-commands/$file >>/${SCRIPT_ROOT}/logs/${this_script} 2>&1' ; } ) 2>>logs/$this_script && \\
     382        echo -e "\nKB: \`du -skx --exclude=${SCRIPT_ROOT} \$(MOUNT_PT)\`\n" >>logs/${this_script}
    383383EOF
    384384) >> $MKFILE.tmp

  • common/func_compare.sh

    r3b3251a r1a1f099  
    4444  local ITERATION=$1
    4545  local   PREV_IT=$2
    46   local PRUNEPATH="/dev /home /jhalfs /lost+found /media /mnt /opt /proc \
     46  local PRUNEPATH="/dev /home /${SCRIPT_ROOT} /lost+found /media /mnt /opt /proc \
    4747/sources /root /srv /sys /tmp /tools /usr/local /usr/src /var/log/paco"
    4848
    4949  if [[ "$PROGNAME" = "clfs" ]] && [[ "$METHOD" = "boot" ]] ; then
    5050    local    ROOT_DIR=/
    51     local DEST_TOPDIR=/jhalfs
    52     local   ICALOGDIR=/jhalfs/logs/ICA
    53     local FARCELOGDIR=/jhalfs/logs/farce
     51    local DEST_TOPDIR=/${SCRIPT_ROOT}
     52    local   ICALOGDIR=/${SCRIPT_ROOT}/logs/ICA
     53    local FARCELOGDIR=/${SCRIPT_ROOT}/logs/farce
    5454  else
    5555    local    ROOT_DIR=$BUILDDIR
    56     local DEST_TOPDIR=$BUILDDIR/jhalfs
     56    local DEST_TOPDIR=$BUILDDIR/${SCRIPT_ROOT}
    5757  fi
    5858

  • master.sh

    r3b3251a r1a1f099  
    137137        * )
    138138          BUILDDIR=$1
    139           JHALFSDIR=$BUILDDIR/jhalfs
     139          JHALFSDIR=$BUILDDIR/${SCRIPT_ROOT}
    140140          LOGDIR=$JHALFSDIR/logs
    141141          MKFILE=$JHALFSDIR/Makefile
Note: See TracChangeset for help on using the changeset viewer.