diff options
| author | gdt <gdt@pkgsrc.org> | 2020-12-24 01:31:19 +0000 |
|---|---|---|
| committer | gdt <gdt@pkgsrc.org> | 2020-12-24 01:31:19 +0000 |
| commit | f1e6ef3b8b8b4bc138710c5d6e6a4024c1862218 (patch) | |
| tree | 8ab5b3dd8eac50442fe76af81b59b4e85dc38ba3 /mk | |
| parent | 634ce8e4d834d1e47939d210d6f139e7cd550225 (diff) | |
| download | pkgsrc-f1e6ef3b8b8b4bc138710c5d6e6a4024c1862218.tar.gz | |
pkgformat-vars.mk: Revert requirement for new PKGTOOLS
As part of the pkgdb migration (NetBSD only), PGKTOOLS_REQD was set to
a recent value (20200828). However, that results in a cyclic
dependency of pkg_install on cwrappers on pkg_install. Once people
set PKG_DBDIR in pkg_install.conf and mk.conf to match their setup,
there is no need -- because of the migration -- to force newer tools.
Testing on TNF's pkgbuild machine indicates this revert works well,
and I received two positive comments and none against.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/pkgformat/pkg/pkgformat-vars.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mk/pkgformat/pkg/pkgformat-vars.mk b/mk/pkgformat/pkg/pkgformat-vars.mk index b602d6fb8c5..c0d076dbefb 100644 --- a/mk/pkgformat/pkg/pkgformat-vars.mk +++ b/mk/pkgformat/pkg/pkgformat-vars.mk @@ -1,4 +1,4 @@ -# $NetBSD: pkgformat-vars.mk,v 1.11 2020/12/18 17:14:58 maya Exp $ +# $NetBSD: pkgformat-vars.mk,v 1.12 2020/12/24 01:31:19 gdt Exp $ # # This Makefile fragment is included indirectly by bsd.prefs.mk and # defines some variables which must be defined earlier than where @@ -32,7 +32,11 @@ PKG_INFO_CMD?= ${PKG_TOOLS_BIN}/pkg_info LINKFARM_CMD?= ${PKG_TOOLS_BIN}/linkfarm # Latest versions of tools required for correct pkgsrc operation. -PKGTOOLS_REQD= 20200828 +.if !empty(USE_PKG_ADMIN_DIGEST:M[Yy][Ee][Ss]) +PKGTOOLS_REQD= 20191008 +.else +PKGTOOLS_REQD= 20100914 +.endif # Latest version of pkg_install required to extract packages PKGTOOLS_VERSION_REQD= 20091115 |