7114186 Can't publish components in s11-sru branch
authorVladimir Marek <Vladimir.Marek@oracle.com>
Mon, 21 Nov 2011 07:20:21 -0800
changeset 591 d3cce09912d0
parent 590 56e37c6e80dd
child 592 d2e52685271a
7114186 Can't publish components in s11-sru branch
make-rules/ips-buildinfo.mk
make-rules/shared-macros.mk
--- a/make-rules/ips-buildinfo.mk	Mon Nov 21 17:52:42 2011 -0800
+++ b/make-rules/ips-buildinfo.mk	Mon Nov 21 07:20:21 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/dev/
+
--- a/make-rules/shared-macros.mk	Mon Nov 21 17:52:42 2011 -0800
+++ b/make-rules/shared-macros.mk	Mon Nov 21 07:20:21 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