diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-02-21 14:40:00 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-02-21 15:09:05 +0100 |
| commit | b6db2d8bfd55268e5a1315f106eb4637ff69afdf (patch) | |
| tree | 951b822e093f4e41f299638952e42eb1c4875c20 | |
| parent | 8ce250ffe64941b4f425b3b9f8a66066c0a070e9 (diff) | |
| download | ptxdist-b6db2d8bfd55268e5a1315f106eb4637ff69afdf.tar.gz ptxdist-b6db2d8bfd55268e5a1315f106eb4637ff69afdf.tar.xz | |
progress: fix total count
This was broken in the final cleanup of the last change.
Also, remove accidentally commited debug 'tee a'.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | scripts/lib/ptxd_make_progress.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/lib/ptxd_make_progress.sh b/scripts/lib/ptxd_make_progress.sh index f66e9261f..d114f425b 100644 --- a/scripts/lib/ptxd_make_progress.sh +++ b/scripts/lib/ptxd_make_progress.sh @@ -12,8 +12,8 @@ ptxd_make_setup_progress() { if [ -n "${PTXDIST_PROGRESS}" -a -n "${PTXDIST_QUIET}" ]; then ptxd_make_target_count=$( \ MAKE=false "${PTXCONF_SETUP_HOST_MAKE}" --dry-run \ - -f "${RULESDIR}/other/Toplevel.make" "${@}" | tee a | \ - grep -E '^target=.*(\.(get|extract|prepare|compile|install|targetinstall|report)|/images/).*finished:' | \ + -f "${RULESDIR}/other/Toplevel.make" "${@}" | \ + grep -E 'ptxd_make_print_progress stop /.*(\.(get|extract|prepare|compile|install|targetinstall|report)|/images/).*finished:' | \ wc -l ; exit ${PIPESTATUS[0]}) if [ $? -ne 0 ]; then echo "Failed to initialize progress data!" >&2 |