--- a/components/Makefile Wed Oct 22 14:45:12 2014 -0700
+++ b/components/Makefile Fri Oct 10 10:07:08 2014 -0700
@@ -134,15 +134,18 @@
$(BASS_O_MATIC) $(TEMPLATE_ZONE:%=--template-zone %) \
$(@:%=--component %) --make $(TARGET) $(LOG)
+# Turn userland-incorporator warnings into build failures
+INCORPORATE_WERROR ?= --Werror
+
incorporation:
$(PKGREPO) refresh -s $(PKG_REPO)
$(WS_TOOLS)/userland-incorporator --repository $(PKG_REPO) \
- -p pkg:/consolidation/$(CONSOLIDATION)/$(CONSOLIDATION)-incorporation@0.$(OS_VERSION),$(BUILD_VERSION) \
- -s "$(CONSOLIDATION) consolidation incorporation" \
- -d "This incorporation constrains packages from the $(CONSOLIDATION) consolidation" \
- -c $(CONSOLIDATION) >$(WS_LOGS)/$(CONSOLIDATION)-incorporation.p5m
- $(PKGSEND) -s $(PKG_REPO) publish --fmri-in-manifest \
- $(WS_LOGS)/$(CONSOLIDATION)-incorporation.p5m
+ --version=0.$(OS_VERSION),$(BUILD_VERSION) -p $(PUBLISHER) \
+ -c $(CONSOLIDATION) --destdir=$(WS_LOGS) $(INCORPORATE_WERROR)
+ for incorporation in $(WS_LOGS)/*.p5m ; do \
+ $(PKGSEND) -s $(PKG_REPO) publish --fmri-in-manifest \
+ $${incorporation} ; \
+ done
publish:
$(MAKE) incorporation