jhalfs directory usage has been replaced by
This commit is contained in:
parent
3b3251a955
commit
1a1f099289
3 changed files with 15 additions and 15 deletions
|
@ -57,7 +57,7 @@ ${BOLD} -B, --book VER${OFF}
|
||||||
|
|
||||||
${BOLD} -D --directory DIR${OFF}
|
${BOLD} -D --directory DIR${OFF}
|
||||||
use DIR directory for building ${BOLD}$(echo $PROGNAME | tr [a-z] [A-Z])${OFF}; all files jhalfs produces
|
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"
|
The current setting for BUILDDIR is "$BUILDDIR"
|
||||||
|
|
||||||
${BOLD} -G, --get-packages${OFF}
|
${BOLD} -G, --get-packages${OFF}
|
||||||
|
@ -202,7 +202,7 @@ cat << EOF
|
||||||
$i: $PREV
|
$i: $PREV
|
||||||
@\$(call echo_message, Building)
|
@\$(call echo_message, Building)
|
||||||
@./progress_bar.sh \$@ \$(MAKE_PID) &
|
@./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
|
EOF
|
||||||
) >> $MKFILE.tmp
|
) >> $MKFILE.tmp
|
||||||
}
|
}
|
||||||
|
@ -322,7 +322,7 @@ wrt_run_as_su() { # Execute script inside time { }, footer to l
|
||||||
(
|
(
|
||||||
cat << EOF
|
cat << EOF
|
||||||
@( time { su - lfs -c "source /home/lfs/.bashrc && $JHALFSDIR/${PROGNAME}-commands/$file" >>logs/$this_script 2>&1 ; } ) 2>>logs/$this_script && \\
|
@( 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
|
EOF
|
||||||
) >> $MKFILE.tmp
|
) >> $MKFILE.tmp
|
||||||
}
|
}
|
||||||
|
@ -336,7 +336,7 @@ wrt_run_as_root() { # Some scripts must be run as root..
|
||||||
(
|
(
|
||||||
cat << EOF
|
cat << EOF
|
||||||
@( time { export LFS=\$(MOUNT_PT) && ${PROGNAME}-commands/$file >>logs/$this_script 2>&1 ; } ) 2>>logs/$this_script && \\
|
@( 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
|
EOF
|
||||||
) >> $MKFILE.tmp
|
) >> $MKFILE.tmp
|
||||||
}
|
}
|
||||||
|
@ -350,7 +350,7 @@ wrt_run_as_root2() { #
|
||||||
(
|
(
|
||||||
cat << EOF
|
cat << EOF
|
||||||
@( time { source envars && ${PROGNAME}-commands/$file >>logs/$this_script 2>&1 ; } ) 2>>logs/$this_script && \\
|
@( 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
|
EOF
|
||||||
) >> $MKFILE.tmp
|
) >> $MKFILE.tmp
|
||||||
}
|
}
|
||||||
|
@ -364,8 +364,8 @@ wrt_run_as_chroot1() { #
|
||||||
local file=$2
|
local file=$2
|
||||||
(
|
(
|
||||||
cat << EOF
|
cat << EOF
|
||||||
@( time { \$(CHROOT1) 'cd /jhalfs && source envars && /jhalfs/${PROGNAME}-commands/$file >>/jhalfs/logs/${this_script} 2>&1' ; } ) 2>>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=jhalfs \$(MOUNT_PT)\`\n" >>logs/${this_script}
|
echo -e "\nKB: \`du -skx --exclude=${SCRIPT_ROOT} \$(MOUNT_PT)\`\n" >>logs/${this_script}
|
||||||
EOF
|
EOF
|
||||||
) >> $MKFILE.tmp
|
) >> $MKFILE.tmp
|
||||||
}
|
}
|
||||||
|
@ -378,8 +378,8 @@ wrt_run_as_chroot2() { #
|
||||||
local file=$2
|
local file=$2
|
||||||
(
|
(
|
||||||
cat << EOF
|
cat << EOF
|
||||||
@( time { \$(CHROOT2) 'cd /jhalfs && source envars && /jhalfs/${PROGNAME}-commands/$file >>/jhalfs/logs/${this_script} 2>&1' ; } ) 2>>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=jhalfs \$(MOUNT_PT)\`\n" >>logs/${this_script}
|
echo -e "\nKB: \`du -skx --exclude=${SCRIPT_ROOT} \$(MOUNT_PT)\`\n" >>logs/${this_script}
|
||||||
EOF
|
EOF
|
||||||
) >> $MKFILE.tmp
|
) >> $MKFILE.tmp
|
||||||
}
|
}
|
||||||
|
|
|
@ -43,17 +43,17 @@ wrt_compare_work() { #
|
||||||
#----------------------------------#
|
#----------------------------------#
|
||||||
local ITERATION=$1
|
local ITERATION=$1
|
||||||
local PREV_IT=$2
|
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"
|
/sources /root /srv /sys /tmp /tools /usr/local /usr/src /var/log/paco"
|
||||||
|
|
||||||
if [[ "$PROGNAME" = "clfs" ]] && [[ "$METHOD" = "boot" ]] ; then
|
if [[ "$PROGNAME" = "clfs" ]] && [[ "$METHOD" = "boot" ]] ; then
|
||||||
local ROOT_DIR=/
|
local ROOT_DIR=/
|
||||||
local DEST_TOPDIR=/jhalfs
|
local DEST_TOPDIR=/${SCRIPT_ROOT}
|
||||||
local ICALOGDIR=/jhalfs/logs/ICA
|
local ICALOGDIR=/${SCRIPT_ROOT}/logs/ICA
|
||||||
local FARCELOGDIR=/jhalfs/logs/farce
|
local FARCELOGDIR=/${SCRIPT_ROOT}/logs/farce
|
||||||
else
|
else
|
||||||
local ROOT_DIR=$BUILDDIR
|
local ROOT_DIR=$BUILDDIR
|
||||||
local DEST_TOPDIR=$BUILDDIR/jhalfs
|
local DEST_TOPDIR=$BUILDDIR/${SCRIPT_ROOT}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "$RUN_ICA" = "1" ]] ; then
|
if [[ "$RUN_ICA" = "1" ]] ; then
|
||||||
|
|
|
@ -136,7 +136,7 @@ while test $# -gt 0 ; do
|
||||||
;;
|
;;
|
||||||
* )
|
* )
|
||||||
BUILDDIR=$1
|
BUILDDIR=$1
|
||||||
JHALFSDIR=$BUILDDIR/jhalfs
|
JHALFSDIR=$BUILDDIR/${SCRIPT_ROOT}
|
||||||
LOGDIR=$JHALFSDIR/logs
|
LOGDIR=$JHALFSDIR/logs
|
||||||
MKFILE=$JHALFSDIR/Makefile
|
MKFILE=$JHALFSDIR/Makefile
|
||||||
;;
|
;;
|
||||||
|
|
Loading…
Reference in a new issue