diff options
| author | mrauch <mrauch@pkgsrc.org> | 2002-07-21 11:53:18 +0000 |
|---|---|---|
| committer | mrauch <mrauch@pkgsrc.org> | 2002-07-21 11:53:18 +0000 |
| commit | 740ad47954df1f53373d906d167b3d5362c5f2d9 (patch) | |
| tree | 95cde7ca83a36fe155a5669315ebce5f00154c34 /mk/bulk | |
| parent | ed4ff8479da7db58646b9178ea21b876c9a07b89 (diff) | |
| download | pkgsrc-740ad47954df1f53373d906d167b3d5362c5f2d9.tar.gz | |
Make bulk builds aware of packages with INTERACTIVE_STAGE and mark them as
"not packaged" instead of "broken".
Diffstat (limited to 'mk/bulk')
| -rw-r--r-- | mk/bulk/bsd.bulk-pkg.mk | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk index 4b0a0568cac..ab4ced55653 100644 --- a/mk/bulk/bsd.bulk-pkg.mk +++ b/mk/bulk/bsd.bulk-pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.bulk-pkg.mk,v 1.38 2002/06/29 03:33:34 dmcmahill Exp $ +# $NetBSD: bsd.bulk-pkg.mk,v 1.39 2002/07/21 11:53:19 mrauch Exp $ # # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@netbsd.org> @@ -299,6 +299,11 @@ bulk-package: fi ;\ done ;\ fi ;\ + if [ -f ${INTERACTIVE_COOKIE} ]; then \ + ${ECHO_MSG} "BULK> Removing old marker for INTERACTIVE_STAGE..." ; \ + ${ECHO_MSG} ${RM} -f ${INTERACTIVE_COOKIE} ; \ + ${DO} ${RM} -f ${INTERACTIVE_COOKIE} ; \ + fi ;\ ${ECHO_MSG} ${MAKE} package '(${PKGNAME})' 2>&1 ; \ ${DO} ( ${MAKE} package 2>&1 ); \ ) 2>&1 | tee -a ${BUILDLOG} ; \ @@ -340,6 +345,9 @@ bulk-package: done ;\ fi ;\ nerrors=`${GREP} -c '^\*\*\* Error code' ${BROKENFILE} || true`; \ + if [ -f ${INTERACTIVE_COOKIE} ]; then \ + nerrors="0"; \ + fi; \ ${ECHO_MSG} " $$nerrors ${PKGPATH}/${BROKENFILE} $$nbrokenby " >> ${_PKGSRCDIR}/${BROKENFILE} \ ) 2>&1 | tee -a ${BROKENFILE}; \ fi ; \ |