From 5181eb35dfeba23fd0c68a56a2e81b55ba03b040 Mon Sep 17 00:00:00 2001 From: Manuel Canales Esparcia Date: Mon, 10 Apr 2006 19:07:33 +0000 Subject: [PATCH] Fixed build system copy. --- common/func_ICA.sh | 8 ++------ extras/do_copy_files | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/common/func_ICA.sh b/common/func_ICA.sh index 93f6d0a..b3fe57c 100644 --- a/common/func_ICA.sh +++ b/common/func_ICA.sh @@ -54,19 +54,15 @@ wrt_prepare() { # #----------------------------------# local ITERATION=$1 local PREV=$2 + local PRUNEPATH="/jhalfs /sources /var/log/paco /opt /dev /home /mnt /proc \ +/root /sys /tmp /usr/src /lost+found /tools" if [[ "$PROGNAME" = "clfs" ]] && [[ "$METHOD" = "boot" ]] ; then - local PRUNEPATH="/jhalfs /sources /var/log/paco /opt /dev /home /mnt /proc \ -/root /sys /tmp /usr/src /lost+found /tools" local ROOT_DIR=/ local DEST_TOPDIR=/jhalfs local ICALOGDIR=/jhalfs/logs/ICA local FARCELOGDIR=/jhalfs/logs/farce else - local PRUNEPATH="$BUILDDIR/jhalfs $BUILDDIR/sources $BUILDDIR/var/log/paco \ -$BUILDDIR/opt $BUILDDIR/dev $BUILDDIR/home $BUILDDIR/mnt \ -$BUILDDIR/proc $BUILDDIR/root $BUILDDIR/sys $BUILDDIR/tmp \ -$BUILDDIR/usr/src $BUILDDIR/lost+found $BUILDDIR/tools" local ROOT_DIR=$BUILDDIR local DEST_TOPDIR=$BUILDDIR/jhalfs fi diff --git a/extras/do_copy_files b/extras/do_copy_files index 3cecf38..cbb6b2f 100755 --- a/extras/do_copy_files +++ b/extras/do_copy_files @@ -21,7 +21,7 @@ TMP_FILE=/tmp/prunelist # There might be an easier way to achieve tar exclusions? Strip # the leading /. for F in $1 ; do - echo ${F#*/} >> $TMP_FILE + echo .${F} >> $TMP_FILE done mkdir -p $3