--- a/.hgtags	Mon Oct 17 14:01:53 2011 -0700
+++ b/.hgtags	Mon Oct 24 15:15:55 2011 -0700
@@ -29,3 +29,4 @@
 4e721bcfa7d12d95913141ec149e63b5fb1c548e build-173
 1e7038bb308ce1660928bea5ba39a6f172b2275c build-174
 72e5516d37ad46ea00cfc1ec6f4661f89163bec8 build-175
+10bd3a98a58281eae06a1ffc728b9a353231bc09 s11
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make-rules/ips-buildinfo.mk	Mon Oct 24 15:15:55 2011 -0700
@@ -0,0 +1,93 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+
+# The package branch version scheme is:
+#
+#       trunk_id.update.SRU.platform.buildid.nightlyid
+#
+# where
+#       trunk_id : build number for tip development gate, with leading 0
+#       update   : 0 for FCS, 1 for update 1, etc.
+#       SRU      : SRU (support repository update) number for this update
+#       platform : reserved for future use.
+#       buildid  : the build number of the last non-zero element from above
+#       nightlyid: nightly build identifier
+
+#
+# For reference, Solaris 11 FCS is branch-id 0.175.0.0.0.2.537
+#                       build 175, respin 2, workspace changeset 537
+#
+
+#
+# The Solaris Marketing release build number.
+#
+TRUNK_ID ?= 0.175
+
+#
+# The Solaris Update number. This will be set by the gatekeepers.
+# The value must match the update number of the release.
+#
+UPDATENUM ?= 1
+
+#
+# Support Respository Update number. This is here to reserve space within the
+# version string. Typically it should not be set unless all the packages
+# are being delivered within an SRU.
+#
+SRUNUM ?= 0
+
+#
+# Platform number. This is here to reserve space within the version
+# string. It should not be set unless there is a specific need to
+# release a platform update while the Solaris Update is being built.
+#
+PLATNUM ?= 0
+
+#
+# Build Identifier. Used to indicate which build (or respin for
+# the development build) of the Solaris Update is being built.
+# This is set by the gatekeepers.
+#
+BUILDID ?= 0
+
+# Each (nightly) build of the code that produces packages needs to
+# be uniquely identified so that packages produced by different
+# builds can't be mixed.  Mixing packages from different builds can
+# easily result in broken global and nonglobal zones.
+#
+NIGHTLYID ?= $(shell hg tip --template '{rev}\n')
+
+#
+# Branch Identifier.  Used in the version section of the package name to
+# identify the operating system branch that the package was produced for.
+#
+BRANCHID ?= \
+    $(TRUNK_ID).$(UPDATENUM).$(SRUNUM).$(PLATNUM).$(BUILDID).$(NIGHTLYID)
+
+#
+# Build Version.  Used in the version section of the package name to identify
+# the operating system version and branch that the package was produced for.
+#
+BUILD_VERSION ?= $(OS_VERSION)-$(BRANCHID)
+

--- a/make-rules/shared-macros.mk	Mon Oct 17 14:01:53 2011 -0700
+++ b/make-rules/shared-macros.mk	Mon Oct 24 15:15:55 2011 -0700
@@ -43,6 +43,14 @@
 # The workspace starts at the mercurial root
 export WS_TOP ?=		$(shell hg root)
 
+WS_LOGS =	$(WS_TOP)/$(MACH)/logs
+WS_REPO =	$(WS_TOP)/$(MACH)/repo
+WS_TOOLS =	$(WS_TOP)/tools
+WS_MAKE_RULES =	$(WS_TOP)/make-rules
+WS_COMPONENTS =	$(WS_TOP)/components
+WS_INCORPORATIONS =	$(WS_TOP)/incorporations
+WS_LINT_CACHE =	$(WS_TOP)/$(MACH)/pkglint-cache
+
 # we want our pkg piplines to fail if there is an error
 # (like if pkgdepend fails in the middle of a pipe), but
 # we don't want the builds or ./configure's failing as well.
@@ -62,76 +70,16 @@
 
 ROOT =			/
 
-# The package branch version scheme is:
-#
-#       trunk_id.update.SRU.platform.buildid.nightlyid
-#
-# where
-#       trunk_id : build number for tip development gate, with leading 0
-#       update   : 0 for FCS, 1 for update 1, etc.
-#       SRU      : SRU (support repository update) number for this update
-#       platform : reserved for future use.
-#       buildid  : the build number of the last non-zero element from above
-#       nightlyid: nightly build identifier
-
-# get the most recent build number from the last mercurial tag
-LAST_HG_TAG =	$(shell hg tags -q | grep build- | head -1)
-LAST_BUILD_NUM = $(LAST_HG_TAG:build-%=%)
-
 OS_VERSION =		$(shell uname -r)
 SOLARIS_VERSION =	$(OS_VERSION:5.%=2.%)
-BUILD_NUM ?=		0.$(shell expr $(LAST_BUILD_NUM) + 1)
 
-#
-# The Solaris Update number. This will be set by the gatekeepers.
-# The value must match the update number of the release.
-#
-UPDATENUM ?= 0
-
-#
-# Support Respository Update number. This is here to reserve space within the
-# version string. Typically it should not be set unless all the packages
-# are being delivered within an SRU.
-#
-SRUNUM ?= 0
-
-#
-# Platform number. This is here to reserve space within the version
-# string. It should not be set unless there is a specific need to
-# release a platform update while the Solaris Update is being built.
-#
-PLATNUM ?= 0
-
-#
-# Build Identifier. Used to indicate which build (or respin for
-# the development build) of the Solaris Update is being built.
-# This is set by the gatekeepers.
-#
-BUILDID ?= 0
-
-# Each (nightly) build of the code that produces packages needs to
-# be uniquely identified so that packages produced by different
-# builds can't be mixed.  Mixing packages from different builds can
-# easily result in broken global and nonglobal zones.
-#
-NIGHTLYID ?=	$(shell hg tip --template '{rev}\n')
-
-BUILD_VERSION ?=	 \
-    $(OS_VERSION)-$(BUILD_NUM).$(UPDATENUM).$(SRUNUM).$(PLATNUM).$(BUILDID).$(NIGHTLYID)
+include $(WS_MAKE_RULES)/ips-buildinfo.mk
 
 COMPILER =		studio
 BITS =			32
 PYTHON_VERSION =	2.6
 PYTHON_VERSIONS =	2.6
 
-WS_LOGS =	$(WS_TOP)/$(MACH)/logs
-WS_REPO =	$(WS_TOP)/$(MACH)/repo
-WS_TOOLS =	$(WS_TOP)/tools
-WS_MAKE_RULES =	$(WS_TOP)/make-rules
-WS_COMPONENTS =	$(WS_TOP)/components
-WS_INCORPORATIONS =	$(WS_TOP)/incorporations
-WS_LINT_CACHE =	$(WS_TOP)/$(MACH)/pkglint-cache
-
 BASS_O_MATIC =	$(WS_TOOLS)/bass-o-matic
 
 CLONEY =	$(WS_TOOLS)/cloney