# HG changeset patch
# User Vladimir Marek <Vladimir.Marek@oracle.com>
# Date 1321888855 28800
# Node ID cc544c5cfe9e93831f6037c506306aad4ec8a393
# Parent  b6ff38462fbe38f540db41c2992229be162e3db4
7114186 Can't publish components in s11-sru branch

diff -r b6ff38462fbe -r cc544c5cfe9e make-rules/ips-buildinfo.mk
--- a/make-rules/ips-buildinfo.mk	Tue Nov 22 15:50:39 2011 +0000
+++ b/make-rules/ips-buildinfo.mk	Mon Nov 21 07:20:55 2011 -0800
@@ -91,3 +91,7 @@
 #
 BUILD_VERSION ?= $(OS_VERSION)-$(BRANCHID)
 
+# Set a default reference repository against which pkglint is run, in case it
+# hasn't been set in the environment.
+CANONICAL_REPO ?=		http://ipkg.us.oracle.com/solaris11/release/
+
diff -r b6ff38462fbe -r cc544c5cfe9e make-rules/shared-macros.mk
--- a/make-rules/shared-macros.mk	Tue Nov 22 15:50:39 2011 +0000
+++ b/make-rules/shared-macros.mk	Mon Nov 21 07:20:55 2011 -0800
@@ -88,10 +88,6 @@
 
 PKG_REPO =	file:$(WS_REPO)
 
-# Set a default reference repository against which pkglint is run, in case it
-# hasn't been set in the environment.
-CANONICAL_REPO ?=		http://ipkg.us.oracle.com/solaris11/dev/
-
 COMPONENT_DIR =	$(shell pwd)
 SOURCE_DIR =	$(COMPONENT_DIR)/$(COMPONENT_SRC)
 BUILD_DIR =	$(COMPONENT_DIR)/build