# HG changeset patch
# User Norm Jacobs <Norm.Jacobs@Oracle.COM>
# Date 1434999413 25200
# Node ID 56630cd6ade34950d6389c8da5e0fa53fce15a98
# Parent  9d8f9947b3716c882ea55430cd7297573dbead2d
21288917 userland packages should include the corresponding changeset id.

diff -r 9d8f9947b371 -r 56630cd6ade3 make-rules/ips.mk
--- a/make-rules/ips.mk	Mon Jun 22 17:12:41 2015 -0700
+++ b/make-rules/ips.mk	Mon Jun 22 11:56:53 2015 -0700
@@ -116,6 +116,8 @@
 PKG_MACROS +=		COMPONENT_HG_REV=$(COMPONENT_HG_REV)
 PKG_MACROS +=		COMPONENT_NAME=$(COMPONENT_NAME)
 PKG_MACROS +=		TPNO=$(TPNO)
+PKG_MACROS +=		CONSOLIDATION_CHANGESET=$(CONSOLIDATION_CHANGESET)
+PKG_MACROS +=		CONSOLIDATION_REPOSITORY_URL=$(CONSOLIDATION_REPOSITORY_URL)
 
 # Add any TPNO_* Makefile macros to the pkgmogrify arguments.
 $(foreach macro, $(filter TPNO_%, $(.VARIABLES)), \
diff -r 9d8f9947b371 -r 56630cd6ade3 make-rules/shared-macros.mk
--- a/make-rules/shared-macros.mk	Mon Jun 22 17:12:41 2015 -0700
+++ b/make-rules/shared-macros.mk	Mon Jun 22 11:56:53 2015 -0700
@@ -95,6 +95,10 @@
 
 ROOT =			/
 
+# The changset and external source repo used in building the packages.
+CONSOLIDATION_CHANGESET=$(shell hg identify -i)
+CONSOLIDATION_REPOSITORY_URL=https://hg.java.net/hg/solaris-userland~gate
+
 # Native OS version
 OS_VERSION :=		$(shell uname -r)
 SOLARIS_VERSION =	$(OS_VERSION:5.%=2.%)
diff -r 9d8f9947b371 -r 56630cd6ade3 transforms/defaults
--- a/transforms/defaults	Mon Jun 22 17:12:41 2015 -0700
+++ b/transforms/defaults	Mon Jun 22 11:56:53 2015 -0700
@@ -63,6 +63,13 @@
 
 set name=variant.arch value=$(MACH)
 
+# Consolidation source repository and changeset information
+set name=com.oracle.info.consolidation.repository-changeset \
+    value="$(CONSOLIDATION_CHANGESET)"
+set name=com.oracle.info.consolidation.repository-url \
+    value="$(CONSOLIDATION_REPOSITORY_URL)"
+
+
 #
 # Defaults for legacy metadata for SVR4 package information
 #