diff options
| -rwxr-xr-x | bin/ptxdist | 28 | ||||
| -rw-r--r-- | scripts/libptxdist.sh | 4 |
2 files changed, 18 insertions, 14 deletions
diff --git a/bin/ptxdist b/bin/ptxdist index 426dc3f86..a0235b23f 100755 --- a/bin/ptxdist +++ b/bin/ptxdist @@ -560,7 +560,7 @@ clean() { fi echo "${PROMPT}removing deps..." - rm -f "${PTXDIST_PLATFORMDIR}/"{depend.out,deptree-a4.ps,deptree.ps} + rm -f "${PTXDIST_PLATFORMDIR}/"{deptree-a4.ps,deptree.ps} echo "${PROMPT}removing imagedir..." rm -fr "${IMAGEDIR}" echo "${PROMPT}removing root..." @@ -1225,7 +1225,7 @@ while [ "$#" != "0" ]; do check_compiler check_dirs check_deps - ptxd_make "${STATEDIR}/${1}.compile" 2>&1 | tee -a ${PTXDIST_PLATFORMDIR}/logfile + ptxd_make "${STATEDIR}/${1}.compile" check_pipe_status exit ;; @@ -1272,7 +1272,7 @@ while [ "$#" != "0" ]; do export EXPORTDIR="${1}" check_ptxconfig check_deps - ptxd_make export 2>&1 | tee -a ${PTXDIST_PLATFORMDIR}/logfile + ptxd_make export check_pipe_status exit ;; @@ -1280,7 +1280,7 @@ while [ "$#" != "0" ]; do check_ptxconfig check_if_selected $1 check_deps - ptxd_make "${STATEDIR}/${1}.extract" 2>&1 | tee -a ${PTXDIST_PLATFORMDIR}/logfile + ptxd_make "${STATEDIR}/${1}.extract" check_pipe_status exit ;; @@ -1288,12 +1288,12 @@ while [ "$#" != "0" ]; do check_ptxconfig check_deps if [ $# -eq 0 ]; then - ptxd_make get 2>&1 | tee -a ${PTXDIST_PLATFORMDIR}/logfile + ptxd_make get check_pipe_status exit else check_if_selected $1 - ptxd_make "${STATEDIR}/${1}.get" 2>&1 | tee -a ${PTXDIST_PLATFORMDIR}/logfile + ptxd_make "${STATEDIR}/${1}.get" check_pipe_status exit fi @@ -1303,7 +1303,7 @@ while [ "$#" != "0" ]; do check_compiler check_dirs check_deps - ptxd_make world 2>&1 | tee -a ${PTXDIST_PLATFORMDIR}/logfile + ptxd_make world check_pipe_status exit ;; @@ -1316,7 +1316,9 @@ while [ "$#" != "0" ]; do check_compiler check_dirs check_deps - ptxd_make images 2>&1 | tee -a ${PTXDIST_PLATFORMDIR}/logfile + ptxd_make world + check_pipe_status + ptxd_make images check_pipe_status exit ;; @@ -1326,7 +1328,7 @@ while [ "$#" != "0" ]; do check_compiler check_dirs check_deps - ptxd_make "${STATEDIR}/${1}.install" 2>&1 | tee -a ${PTXDIST_PLATFORMDIR}/logfile + ptxd_make "${STATEDIR}/${1}.install" check_pipe_status exit ;; @@ -1392,7 +1394,7 @@ while [ "$#" != "0" ]; do check_compiler check_dirs check_deps - ptxd_make "${1}" 2>&1 | tee -a ${PTXDIST_PLATFORMDIR}/logfile + ptxd_make "${1}" check_pipe_status exit ;; @@ -1461,14 +1463,14 @@ while [ "$#" != "0" ]; do check_compiler check_dirs check_deps - ptxd_make "${STATEDIR}/${1}.prepare" 2>&1 | tee -a ${PTXDIST_PLATFORMDIR}/logfile + ptxd_make "${STATEDIR}/${1}.prepare" check_pipe_status exit ;; print) shift check_ptxconfig check_deps - ptxd_make "print-${1}" 2>&1 | tee -a ${PTXDIST_PLATFORMDIR}/logfile + ptxd_make "print-${1}" check_pipe_status shift ;; @@ -1506,7 +1508,7 @@ while [ "$#" != "0" ]; do check_compiler check_dirs check_deps - ptxd_make "${STATEDIR}/${1}.targetinstall" 2>&1 | tee -a ${PTXDIST_PLATFORMDIR}/logfile + ptxd_make "${STATEDIR}/${1}.targetinstall" check_pipe_status exit ;; diff --git a/scripts/libptxdist.sh b/scripts/libptxdist.sh index 093c86660..0d4c81d86 100644 --- a/scripts/libptxdist.sh +++ b/scripts/libptxdist.sh @@ -76,7 +76,9 @@ ptxd_kconfig() { # # ptxd_make() { - make $PTXDIST_MAKE_DBG -f "${PTXDIST_TOPDIR}/rules/other/Toplevel.make" "${@}" + make ${PTXDIST_MAKE_DBG} ${PTXDIST_PARALLELMFLAGS_EXTERN} \ + -f "${PTXDIST_TOPDIR}/rules/other/Toplevel.make" "${@}" 2>&1 | + tee -a ${PTXDIST_PLATFORMDIR}/logfile } |