--- a/make_release_packages	Wed Oct 19 22:31:01 2011 -0700
+++ b/make_release_packages	Tue Oct 25 12:37:59 2011 -0700
@@ -68,18 +68,15 @@
 LOG="$(pwd)/log/make-pkgs"
 CHECK_LOG="$(pwd)/log/check-pkgs"
 
-if [[ -z "${XNV_BUILDNUM}" ]] ; then
-    # Get build version from hg by searching for most recent tag matching nv_*
-    BUILD_TAG="$(hg parent --template '{latesttag}\n' | \
-        perl -l -n -e 'if ($_ =~ m/^nv_(\d+)/) {print $1}')"
+# Get build version from hg by searching for most recent tag matching s11u*
+BUILD_TAG="$(hg parent --template '{latesttag}\n' | \
+    perl -l -n -e 'if ($_ =~ m/^s11u\d+_\d+/) {print $_}')"
 
-    if [[ -z "${BUILD_TAG}" ]] ; then
-	fatal_error "BUILD_TAG could not be found from hg parent"
-    fi
-    XNV_BUILDNUM="${BUILD_TAG}"
+if [[ -z "${BUILD_TAG}" ]] ; then
+    fatal_error "BUILD_TAG could not be found from hg parent"
 fi
 
-print "Building packages for X Consolidation, Nevada build ${XNV_BUILDNUM}"
+print "Building packages for X Consolidation, build ${BUILD_TAG}"
 
 MACH="$(uname -p)"
 
@@ -90,11 +87,11 @@
 
 cd pkg
 ${XMAKE} clean > "${LOG}" 2>&1
-${XMAKE} install TRUNKID="${XNV_BUILDNUM}" "${PUBLISHER_FLAGS}" > "${LOG}" 2>&1
+${XMAKE} install "${PUBLISHER_FLAGS}" > "${LOG}" 2>&1
 print "Result log is in ${LOG}"
 
 print "Checking built packages"
-${XMAKE} check TRUNKID="${XNV_BUILDNUM}" > "${CHECK_LOG}" 2>&1
+${XMAKE} check > "${CHECK_LOG}" 2>&1
 print "Package check log is in ${CHECK_LOG}"
 
 "${BUILD_TOOLS}/find-build-errors" -s "${LOG}"

--- a/pkg/Makefile.buildnum	Wed Oct 19 22:31:01 2011 -0700
+++ b/pkg/Makefile.buildnum	Tue Oct 25 12:37:59 2011 -0700
@@ -61,24 +61,35 @@
 #
 
 #
-# Generate the trunk id of the packages from the tag in the gate.
-# In X the Nevada builds are tagged with nv_XXX where XXX is the
+# Generate various ids of the packages from the tag in the gate.
+# In X the Nevada builds were tagged with nv_XXX where XXX is the
 # build/trunk number.
 #
 # When the next development train is started this pattern will need to be
-# changed in order to match the tag used there.
+# uncommented & changed in order to match the tag used there:
 #
-TRUNKID :sh = hg parent --template '{latesttag}\n' | \
-        perl -l -n -e 'if ($_ =~ m/^nv_(\d+)/) {print $1} else {exit 1}'
+# TRUNKID :sh = hg parent --template '{latesttag}\n' | \
+#        perl -l -n -e 'if ($_ =~ m/^nv_(\d+)/) {print $1} else {exit 1}'
+
 # If you get mksh: Fatal error from the above, then you have an unexpected
 # tag other than nv_XXX in your hg repo.   You can run make TRUNKID=123 to
 # override with a different build id until you fix your repo or this regexp.
 
+# For Solaris 11 updates, the TRUNKID is always 175, since that's the build
+# we branched the updates at.
+TRUNKID= 175
+
 #
 # The Solaris Update number. This will be set by the gatekeepers.
 # The value must match the update number of the release.
 #
-UPDATENUM= 0
+# Uncomment for development train:
+# UPDATENUM= 0
+
+# For Solaris 11 updates, the update number is part of the tag (s11u1_01 for
+# instance):
+UPDATENUM:sh = hg parent --template '{latesttag}\n' | \
+        perl -l -n -e 'if ($_ =~ m/^s11u(\d+)_/) {print $1} else {exit 1}'
 
 #
 # Support Respository Update number. This is here to reserve space within the
@@ -99,7 +110,13 @@
 # the development build) of the Solaris Update is being built. 
 # This is set by the gatekeepers.
 #
-BUILDID= 0
+# Uncomment for development train:
+# BUILDID= 0
+
+# For Solaris 11 updates, the build number is part of the tag (s11u1_01 for
+# instance):
+BUILDID:sh = hg parent --template '{latesttag}\n' | \
+        perl -l -n -e 'if ($_ =~ m/^s11u\d+_0*(\d+)/) {print $1} else {exit 1}'
 
 #
 # Each (nightly) build of the code that produces packages needs to