diff options
| -rwxr-xr-x | remote/setup_tools | 10 | ||||
| -rw-r--r-- | remote/tools/base/base.build | 2 |
2 files changed, 4 insertions, 8 deletions
diff --git a/remote/setup_tools b/remote/setup_tools index 2df84a5d..bf3f5157 100755 --- a/remote/setup_tools +++ b/remote/setup_tools @@ -40,7 +40,7 @@ copyfileswithdependencies () cd build - COPYFILES_LIST="list_wanted_stage3.2" + local COPYFILES_LIST="list_wanted_stage3.2" [ -e ${COPYFILES_LIST} ] && rm ${COPYFILES_LIST} @@ -151,9 +151,7 @@ copyfileswithdependencies () if [ -s "$COPYFILES_LIST" ]; then local CLISTCOUNT=$(cat "$COPYFILES_LIST" | wc -l) pinfo "Copying $CLISTCOUNT files to stage 3.2 target directory." - tar -cp $(cat ${COPYFILES_LIST}|sort -u) | tar -xp -C "${INIT_DIR}" - local RET=$? - [ "x$RET" != "x0" ] && perror "Could not tar-copy to $INIT_DIR" + tarcopy "$(cat ${COPYFILES_LIST}|sort -u)" "${INIT_DIR}" fi unset REQUIRED_BINARIES unset REQUIRED_LIBRARIES @@ -176,9 +174,7 @@ get_basic_libs () { BASICLIBS="${BASICLIBS} $i $(readlink -f "$i")" fi done - tar -cp ${BASICLIBS} | tar -xp -C ${INIT_DIR} - local RET=$? - [ "x$RET" != "x0" ] && perror "Could not tar-copy to $INIT_DIR" + tarcopy "${BASICLIBS}" "${INIT_DIR}" } generate_stage32 () { diff --git a/remote/tools/base/base.build b/remote/tools/base/base.build index 98f24047..06ff22b7 100644 --- a/remote/tools/base/base.build +++ b/remote/tools/base/base.build @@ -51,7 +51,7 @@ build() { local NUMFILES=$(cat "${FILELIST}" | wc -l) if [ "x$NUMFILES" != "x" -a "x$NUMFILES" != "x0" ]; then pinfo "File list generated at ${BUILDDIR}/${FILELIST} ($NUMFILES entries)" - tarcopy "${FILELIST}" "${BUILDDIR}" + tarcopy "$(cat "${FILELIST}")" "${BUILDDIR}" fi } |