--- a/make-rules/shared-macros.mk Tue Mar 01 07:35:21 2016 -0800
+++ b/make-rules/shared-macros.mk Tue Mar 01 07:36:14 2016 -0800
@@ -80,10 +80,15 @@
SHELL= /bin/bash
# We want "nightly" as our publisher, to match other consolidations and
-# facilitate migrations. G11N wants $(CONSOLIDATION)-localizable for
+# facilitate migrations (except for evaluation builds, which need to use
+# "solaris" as the publisher). G11N wants $(CONSOLIDATION)-localizable for
# the localizable publisher.
CONSOLIDATION = userland
+ifeq ($(BUILD_TYPE),evaluation)
+PUBLISHER ?= solaris
+else
PUBLISHER ?= nightly
+endif
PUBLISHER_LOCALIZABLE ?= $(CONSOLIDATION)-localizable
# Defines $(space) as a single blank space, so we can use it to convert
--- a/tools/pkglintrc Tue Mar 01 07:35:21 2016 -0800
+++ b/tools/pkglintrc Tue Mar 01 07:36:14 2016 -0800
@@ -18,14 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
#
[pkglint]
pkglint.ext.content = pkglint.userland
# Used by the publisher_in_fmri method in .../tools/python/pkglint/userland.py
-userland.manifest002.allowed_pubs = nightly userland-localizable
+userland.manifest002.allowed_pubs = nightly solaris userland-localizable
# turn off reporting of 'pkg.linted*' attributes in manifests. We already
# get a pkglint001.5 INFO message with the WARNING or ERROR that we have