7020081 userland parallel builds break in pkglint
authorNorm Jacobs <Norm.Jacobs@Oracle.COM>
Wed, 16 Feb 2011 15:23:32 -0800
changeset 92 b4be50cb7106
parent 91 03e2f81135e4
child 93 b579c7b1bb44
7020081 userland parallel builds break in pkglint
components/Makefile
--- a/components/Makefile	Wed Feb 16 09:44:13 2011 -0800
+++ b/components/Makefile	Wed Feb 16 15:23:32 2011 -0800
@@ -52,6 +52,9 @@
 prep build install publish test:	TEMPLATE_ZONE=$(ZONE)
 prep build install publish test:	LOG = >$(WS_LOGS)/[email protected]$(TARGET).log 2>&1
 
+# turn off pkglint for the individual component builds.
+publish:		MAKEFLAGS += PKGLINT=/bin/true
+
 .DEFAULT:	publish
 
 download prep build install publish install-packages validate \
@@ -99,6 +102,15 @@
 	 $(BASS_O_MATIC) $(TEMPLATE_ZONE:%=--template-zone %) \
 			 $(@:%=--component %) --make $(TARGET) $(LOG)
 
+publish:
+# pkglint all of the published manifests in one batch.
+ifdef CANONICAL_REPO
+	@echo 'pkglinting all package manifests...'
+	@$(ENV) PYTHONPATH=$(WS_TOOLS)/python $(PKGLINT) \
+			-c $(WS_LINT_CACHE) -f $(WS_TOOLS)/pkglintrc \
+			$(shell find . -name 'manifest-*.published')
+endif
+
 $(COMPONENT_DIRS.nosetup):	FORCE
 	@cd $(@:%.nosetup=%) && echo "$(TARGET) $(@:%.nosetup=%)" && \
 	 $(BASS_O_MATIC) $(TEMPLATE_ZONE:%=--template-zone %) \