diff options
| author | jlam <jlam@pkgsrc.org> | 2006-07-13 14:02:34 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-07-13 14:02:34 +0000 |
| commit | 7a2c97d53fecacc96925c6584dd0b8db8ae097b9 (patch) | |
| tree | 054a4952b111d37e6eb8aaa78c0125d125c86d9a /mk/fetch | |
| parent | 41a963b660aed13cb035a75bf5ee4bb41beaf95a (diff) | |
| download | pkgsrc-7a2c97d53fecacc96925c6584dd0b8db8ae097b9.tar.gz | |
* Add a new stage "bootstrap-depends" that happens before all other
stages, and that installs dependencies listed in BOOTSTRAP_DEPENDS.
The bootstrap-depends step works just like the normal depends step
and honors the value of DEPENDS_TARGET. It's now possible to add
dependencies solely to facilitate fetching the distfiles, e.g.
BOOTSTRAP_DEPENDS+= curl-[0-9]*:../../www/curl
* Teach the tools framework about ":bootstrap" as a tools modifier
which indicates the tool should be added as a dependency via
BOOTSTRAP_DEPENDS.
* Add "digest" to the tools framework.
* Use USE_TOOLS+=digest:bootstrap to force pkgsrc to install digest
before anything else. Get rid of unused "uptodate-digest" target
and related digest version-checking code.
* Finish the refactoring work: split checksum-related code out of
bsd.pkg.mk and into pkgsrc/mk/checksum and replace the "checksum"
target command list with a script that does all the real work.
* Make DIGEST_ALGORITHMS and PATCH_DIGEST_ALGORITHM into private
variables by prepending them with an underscore. Also, rename
_PATCH_DIGEST_ALGORITHM to _PATCH_DIGEST_ALGORITHMS and adjust the
makepatchsum target to allow that variable to contain a list of
algorithms, all of which are used when creating the patch checksums
for ${DISTINFO_FILE}.
Diffstat (limited to 'mk/fetch')
| -rw-r--r-- | mk/fetch/bsd.fetch-vars.mk | 7 | ||||
| -rw-r--r-- | mk/fetch/fetch.mk | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/mk/fetch/bsd.fetch-vars.mk b/mk/fetch/bsd.fetch-vars.mk index cd4006d68b9..25e06ee95e4 100644 --- a/mk/fetch/bsd.fetch-vars.mk +++ b/mk/fetch/bsd.fetch-vars.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.fetch-vars.mk,v 1.2 2006/06/06 15:28:52 jlam Exp $ +# $NetBSD: bsd.fetch-vars.mk,v 1.3 2006/07/13 14:02:34 jlam Exp $ # # This Makefile fragment is included separately by bsd.pkg.mk and # defines some variables which must be defined earlier than where @@ -22,3 +22,8 @@ _DISTDIR= ${DISTDIR}/${DIST_SUBDIR} DISTFILES?= ${DISTNAME}${EXTRACT_SUFX} + +# "Failover" fetching requires the digest tool to compute checksums to +# verify any fetched files. +# +USE_TOOLS+= ${FAILOVER_FETCH:Ddigest\:bootstrap} diff --git a/mk/fetch/fetch.mk b/mk/fetch/fetch.mk index 1c52f1d8827..95029207035 100644 --- a/mk/fetch/fetch.mk +++ b/mk/fetch/fetch.mk @@ -1,4 +1,4 @@ -# $NetBSD: fetch.mk,v 1.5 2006/07/05 09:08:35 jlam Exp $ +# $NetBSD: fetch.mk,v 1.6 2006/07/13 14:02:34 jlam Exp $ ###################################################################### ### fetch (PUBLIC) @@ -8,7 +8,7 @@ ### .PHONY: fetch .if !target(fetch) -fetch: check-vulnerable pre-fetch do-fetch post-fetch +fetch: bootstrap-depends check-vulnerable pre-fetch do-fetch post-fetch .endif # If this host is behind a filtering firewall, use passive ftp(1) @@ -261,7 +261,7 @@ batch-check-distfiles: .PHONY: do-fetch .if !target(do-fetch) -do-fetch: ${FAILOVER_FETCH:Duptodate-digest} +do-fetch: . if !empty(_ALLFILES) ${_PKG_SILENT}${_PKG_DEBUG} \ ${TEST} -d ${_DISTDIR} || ${MKDIR} ${_DISTDIR} |