132 $(COMPONENT_DIRS): $(WS_LOGS) setup FORCE |
132 $(COMPONENT_DIRS): $(WS_LOGS) setup FORCE |
133 @cd $@ && echo "$(TARGET) $@" && \ |
133 @cd $@ && echo "$(TARGET) $@" && \ |
134 $(BASS_O_MATIC) $(TEMPLATE_ZONE:%=--template-zone %) \ |
134 $(BASS_O_MATIC) $(TEMPLATE_ZONE:%=--template-zone %) \ |
135 $(@:%=--component %) --make $(TARGET) $(LOG) |
135 $(@:%=--component %) --make $(TARGET) $(LOG) |
136 |
136 |
|
137 # Turn userland-incorporator warnings into build failures |
|
138 INCORPORATE_WERROR ?= --Werror |
|
139 |
137 incorporation: |
140 incorporation: |
138 $(PKGREPO) refresh -s $(PKG_REPO) |
141 $(PKGREPO) refresh -s $(PKG_REPO) |
139 $(WS_TOOLS)/userland-incorporator --repository $(PKG_REPO) \ |
142 $(WS_TOOLS)/userland-incorporator --repository $(PKG_REPO) \ |
140 -p pkg:/consolidation/$(CONSOLIDATION)/$(CONSOLIDATION)-incorporation@0.$(OS_VERSION),$(BUILD_VERSION) \ |
143 --version=0.$(OS_VERSION),$(BUILD_VERSION) -p $(PUBLISHER) \ |
141 -s "$(CONSOLIDATION) consolidation incorporation" \ |
144 -c $(CONSOLIDATION) --destdir=$(WS_LOGS) $(INCORPORATE_WERROR) |
142 -d "This incorporation constrains packages from the $(CONSOLIDATION) consolidation" \ |
145 for incorporation in $(WS_LOGS)/*.p5m ; do \ |
143 -c $(CONSOLIDATION) >$(WS_LOGS)/$(CONSOLIDATION)-incorporation.p5m |
146 $(PKGSEND) -s $(PKG_REPO) publish --fmri-in-manifest \ |
144 $(PKGSEND) -s $(PKG_REPO) publish --fmri-in-manifest \ |
147 $${incorporation} ; \ |
145 $(WS_LOGS)/$(CONSOLIDATION)-incorporation.p5m |
148 done |
146 |
149 |
147 publish: |
150 publish: |
148 $(MAKE) incorporation |
151 $(MAKE) incorporation |
149 # pkglint all of the published manifests in one batch. |
152 # pkglint all of the published manifests in one batch. |
150 ifdef CANONICAL_REPO |
153 ifdef CANONICAL_REPO |