Mercurial > illumos > illumos-gate
changeset 13528:d5dc5fc5db60
1751 usr/src/pkg/Makefile should define PKGFMT_OUTPUT=v1 when checking manifests
1752 Add PKGFMT_OUTPUT=v1 to usr/src/tools/env/illumos.sh to prevent footshooting
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Reviewed by: Gordon Ross <gordon.w.ross@gmail.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
| author | Yuri Pankov <yuri.pankov@nexenta.com> |
|---|---|
| date | Sat, 19 Nov 2011 17:59:05 +0400 |
| parents | 4b5bd4534d91 |
| children | 36f298df0acc |
| files | usr/src/pkg/Makefile usr/src/tools/env/illumos.sh |
| diffstat | 2 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/pkg/Makefile Thu Nov 17 14:34:33 2011 +0300 +++ b/usr/src/pkg/Makefile Sat Nov 19 17:59:05 2011 +0400 @@ -485,7 +485,7 @@ $(PDIR)/%.mog: manifests/%.mf @print "Processing manifest $(<F)" - @pkgfmt -c $< + @env PKGFMT_OUTPUT=v1 pkgfmt -c $< $(PKGDEBUG)$(RM) $(@) $(@:%.mog=%) $(@:%.mog=%.nodepend) \ $(@:%.mog=%.lics) $(PDIR)/$(@F:%.mog=%).metadata.* $(@).vars $(PKGDEBUG)$(PKGMOGRIFY) $(PKGMOG_VERBOSE) $(PM_INC:%= -I %) \
--- a/usr/src/tools/env/illumos.sh Thu Nov 17 14:34:33 2011 +0300 +++ b/usr/src/tools/env/illumos.sh Sat Nov 19 17:59:05 2011 +0400 @@ -181,6 +181,9 @@ export PKGARCHIVE="${CODEMGR_WS}/packages/${MACH}/nightly" # export PKGPUBLISHER_REDIST='on-redist' +# Package manifest format version. +export PKGFMT_OUTPUT='v1' + # we want make to do as much as it can, just in case there's more than # one problem. export MAKEFLAGS='k'