diff -r 111c46cade93 -r db8a55996482 doc/packaging.txt --- a/doc/packaging.txt Mon Apr 04 23:24:05 2011 -0700 +++ b/doc/packaging.txt Tue Apr 05 09:12:38 2011 +0200 @@ -17,23 +17,23 @@ | v mogrified manifest - (.../{component}/{build-dir}/manifest-$(ARCH)-{component}.mogrified) + (.../{component}/{build-dir}/manifest-$(MACH)-{component}.mogrified) | v dependencies generated - (.../{component}/{build-dir}/manifest-$(ARCH)-{component}.depend) + (.../{component}/{build-dir}/manifest-$(MACH)-{component}.depend) | v dependencies resolved - (.../{component}/{build-dir}/manifest-$(ARCH)-{component}.resolved) + (.../{component}/{build-dir}/manifest-$(MACH)-{component}.resolved) | v manifest validation - (.../{component}/{build-dir}/manifest-$(ARCH)-{component}.linted) + (.../{component}/{build-dir}/manifest-$(MACH)-{component}.linted) | v publication manifest - (.../{component}/{build-dir}/manifest-$(ARCH)-{component}.published) + (.../{component}/{build-dir}/manifest-$(MACH)-{component}.published) | v publication @@ -57,9 +57,8 @@ license actions should be placed in the canonical manifest. Mogrified Manifest - The canonical manifest is combined with a template manifest header at - $(WS_TOP)/transforms/manifest-metadata-template, a set of the transforms - in $(WS_TOP)/transforms, and a set of macros are combined to more complete + The canonical manifest is combined with a set of the transforms + in $(WS_TOP)/transforms, and a set of macros to more complete package manifest using pkgmogrify(1). The transforms apply default attributes to the various actions in the canonical manifest(s). More detail about the attributes can be found in the transform file themselves. @@ -73,7 +72,8 @@ $(BUILD_VERSION) $(SOLARIS_VERSION) $(OS_VERSION) - $(IPS_COMPONENTVERSION) + $(IPS_COMPONENT_VERSION) + $(COMPONENT_VERSION) $(COMPONENT_PROJECT_URL) $(COMPONENT_ARCHIVE_URL) @@ -83,7 +83,7 @@ These dependencies are only those that "pkgdepend generate" can determine on it's own. Additional dependencies that can not be automatically determined by pkgdepend(1) should be placed in the canonical manifest. - Staticly defined dependencies should be described in a canonical manifest + Statically defined dependencies should be described in a canonical manifest in an unresolved form (ie. the form generated by "pkgdepend generate"). Ex: depend fmri=__TBD pkg.debug.depend.file=etc/passwd \