--- a/components/Makefile Mon Nov 16 10:12:13 2015 -0800
+++ b/components/Makefile Fri Nov 06 08:11:17 2015 -0800
@@ -159,7 +159,6 @@
INCORPORATE_WERROR ?= --Werror
incorporation:
- $(PKGREPO) refresh -s $(PKG_REPO)
$(WS_TOOLS)/userland-incorporator --repository $(PKG_REPO) \
--version=0.$(OS_VERSION),$(BUILD_VERSION) -p $(PUBLISHER) \
-c $(CONSOLIDATION) --destdir=$(WS_MACH) $(INCORPORATE_WERROR)
@@ -169,6 +168,7 @@
done
publish:
+ $(PKGREPO) refresh -s $(PKG_REPO)
# evaluation packages don't need to be incorporated
ifneq ($(BUILD_TYPE), evaluation)
$(MAKE) incorporation
--- a/components/cyrus-sasl/Makefile Mon Nov 16 10:12:13 2015 -0800
+++ b/components/cyrus-sasl/Makefile Fri Nov 06 08:11:17 2015 -0800
@@ -68,6 +68,13 @@
include $(WS_TOP)/make-rules/prep.mk
CONFIGURE_DEFAULT_DIRS=no
include $(WS_TOP)/make-rules/configure.mk
+
+# Migrated from ON in S12, including stuff from system/header, so this
+# cannot be installed on an S11 box.
+ifeq ($(BUILD_TYPE), evaluation)
+PUBLISH_STAMP=
+endif
+
include $(WS_TOP)/make-rules/ips.mk
include $(WS_TOP)/make-rules/lint-libraries.mk
--- a/components/meta-packages/developer-opensolaris-userland/Makefile Mon Nov 16 10:12:13 2015 -0800
+++ b/components/meta-packages/developer-opensolaris-userland/Makefile Fri Nov 06 08:11:17 2015 -0800
@@ -32,6 +32,13 @@
COMPONENT_BUGDB= gate-stuff/userland
include $(WS_MAKE_RULES)/prep.mk
+
+# This has a dependency on every REQUIRED_PACKAGE in Userland, some of which
+# are not available on S11.
+ifeq ($(BUILD_TYPE), evaluation)
+PUBLISH_STAMP=
+endif
+
include $(WS_MAKE_RULES)/ips.mk
$(WS_MACH)/requires.mk:
--- a/components/openldap/Makefile Mon Nov 16 10:12:13 2015 -0800
+++ b/components/openldap/Makefile Fri Nov 06 08:11:17 2015 -0800
@@ -50,6 +50,12 @@
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/configure.mk
+
+# This depends on libsasl which cannot be installed on S11.
+ifeq ($(BUILD_TYPE), evaluation)
+PUBLISH_STAMP=
+endif
+
include $(WS_MAKE_RULES)/ips.mk
COMPONENT_PRE_CONFIGURE_ACTION = \