# HG changeset patch
# User Mike Sullivan <Mike.Sullivan@Oracle.COM>
# Date 1317319138 25200
# Node ID db21abcd4c919d5e17d9ab4b95694a8e6d4cca8f
# Parent  e8d15f0b26921e9c0cec1d26b3981b6a167e9b73
7095147 userland fails to pkglint on 174

diff -r e8d15f0b2692 -r db21abcd4c91 components/Makefile
--- a/components/Makefile	Wed Sep 28 15:15:21 2011 +0000
+++ b/components/Makefile	Thu Sep 29 10:58:58 2011 -0700
@@ -89,7 +89,7 @@
 $(WS_LINT_CACHE):	$(WS_LOGS)
 ifdef CANONICAL_REPO
 	@echo "Generating pkglint(1) cache from $(CANONICAL_REPO)..."
-	@(echo "set name=fmri value=pkg:/dummy" | $(PKGLINT) \
+	@(echo "set name=fmri value=pkg:/dummy@0,$(BUILD_VERSION)" | $(PKGLINT) \
 		-c $(WS_LINT_CACHE) -r $(CANONICAL_REPO) /dev/fd/0 \
 		>$(WS_LOGS)/naughty-canonical-repo-actions 2>&1 ; exit 0)
 else
diff -r e8d15f0b2692 -r db21abcd4c91 make-rules/shared-macros.mk
--- a/make-rules/shared-macros.mk	Wed Sep 28 15:15:21 2011 +0000
+++ b/make-rules/shared-macros.mk	Thu Sep 29 10:58:58 2011 -0700
@@ -80,7 +80,7 @@
 
 OS_VERSION =		$(shell uname -r)
 SOLARIS_VERSION =	$(OS_VERSION:5.%=2.%)
-BUILD_NUM =		0.$(shell expr $(LAST_BUILD_NUM) + 1)
+BUILD_NUM ?=		0.$(shell expr $(LAST_BUILD_NUM) + 1)
 
 #
 # The Solaris Update number. This will be set by the gatekeepers.
@@ -116,7 +116,7 @@
 #
 NIGHTLYID ?=	$(shell hg tip --template '{rev}\n')
 
-BUILD_VERSION =	 \
+BUILD_VERSION ?=	 \
     $(OS_VERSION)-$(BUILD_NUM).$(UPDATENUM).$(SRUNUM).$(PLATNUM).$(BUILDID).$(NIGHTLYID)
 
 COMPILER =		studio