21249474 s/pre-release/evaluation/g + other tweaks
authorJohn Beck <John.Beck@Oracle.COM>
Mon, 15 Jun 2015 10:53:55 -0700
changeset 4490 5a5296580120
parent 4486 8a12763ec19a
child 4494 f5b717124172
21249474 s/pre-release/evaluation/g + other tweaks
components/meta-packages/evaluation/Makefile
components/meta-packages/evaluation/evaluation.p5m
components/meta-packages/pre-release/Makefile
components/meta-packages/pre-release/pre-release.license
components/meta-packages/pre-release/pre-release.p5m
licenses/evaluation
make-rules/ips.mk
make-rules/shared-macros.mk
transforms/evaluation
transforms/pre-release
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/evaluation/Makefile	Mon Jun 15 10:53:55 2015 -0700
@@ -0,0 +1,37 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+include ../../../make-rules/shared-macros.mk
+include $(WS_MAKE_RULES)/prep.mk
+
+COMPONENT_NAME=		evaluation
+COMPONENT_VERSION=	1.0
+COMPONENT_BUGDB=	gate-stuff/userland
+
+ifneq ($(BUILD_TYPE), evaluation)
+PUBLISH_STAMP=
+endif
+
+include $(WS_MAKE_RULES)/ips.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/evaluation/evaluation.p5m	Mon Jun 15 10:53:55 2015 -0700
@@ -0,0 +1,40 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# Every package automatically gets a license action added to it during an
+# 'evaluation' build.  We need to add must-accept and must-display attributes
+# to this package so that installing it always displays the license and
+# requires that it be accepted.
+<transform license license=evaluation -> add must-accept true>
+<transform license license=evaluation -> add must-display true>
+set name=pkg.fmri \
+    value=pkg:/release/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="evaluation license meta-package"
+set name=pkg.description value="This package contains the evaluation license."
+set name=pkg.linted.userland.manifest001.0 value=true
+set name=com.oracle.info.description value="evaluation license meta-package"
+set name=info.classification value=org.opensolaris.category.2008:System/Core
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file evaluation path=etc/notices/evaluation
--- a/components/meta-packages/pre-release/Makefile	Mon Jun 15 17:59:44 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
-#
-
-include ../../../make-rules/shared-macros.mk
-include $(WS_MAKE_RULES)/prep.mk
-
-COMPONENT_NAME=		pre-release
-COMPONENT_VERSION=	1.0
-COMPONENT_BUGDB=	gate-stuff/userland
-
-ifneq ($(BUILD_TYPE), pre-release)
-PUBLISH_STAMP=
-endif
-
-include $(WS_MAKE_RULES)/ips.mk
--- a/components/meta-packages/pre-release/pre-release.license	Mon Jun 15 17:59:44 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-TBD pre-release software license goes here.
--- a/components/meta-packages/pre-release/pre-release.p5m	Mon Jun 15 17:59:44 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
-#
-
-set name=pkg.fmri \
-    value=pkg:/release/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="pre-release license meta-package"
-set name=pkg.description value="This package contains the pre-release license."
-set name=pkg.linted.userland.manifest001.0 value=true
-set name=com.oracle.info.description value="pre-release license meta-package"
-set name=info.classification value=org.opensolaris.category.2008:System/Core
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file pre-release.license path=etc/notices/pre-release
-license pre-release.license license=pre-release must-accept=true \
-    must-display=true
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/licenses/evaluation	Mon Jun 15 10:53:55 2015 -0700
@@ -0,0 +1,1 @@
+TBD evaluation software license goes here.
--- a/make-rules/ips.mk	Mon Jun 15 17:59:44 2015 -0700
+++ b/make-rules/ips.mk	Mon Jun 15 10:53:55 2015 -0700
@@ -90,11 +90,11 @@
 PUBLISH_TRANSFORMS +=	$(WS_TOP)/transforms/incorporate
 PUBLISH_TRANSFORMS +=	$(WS_TOP)/transforms/publish-cleanup
 
-# If we are building "pre-release" packages, add the pre-release license
+# If we are building "evaluation" packages, add the evaluation license
 # action so that the package(s) display the terms and require acceptance
 # to install.
-ifeq ($(BUILD_TYPE),pre-release)
-PUBLISH_TRANSFORMS += $(WS_TOP)/transforms/pre-release
+ifeq ($(BUILD_TYPE),evaluation)
+PUBLISH_TRANSFORMS += $(WS_TOP)/transforms/evaluation
 endif
 
 PKG_MACROS +=		MACH=$(MACH)
@@ -133,7 +133,7 @@
 # We use += below so anyone wishing to put other directories at the beginning
 # of the list can do so, by setting PKG_PROTO_DIRS before including this file.
 # So don't change += to = here or components that use this will break.
-PKG_PROTO_DIRS += $(MANGLED_DIR) $(PROTO_DIR) $(@D) $(COMPONENT_DIR) $(COMPONENT_SRC)
+PKG_PROTO_DIRS += $(MANGLED_DIR) $(PROTO_DIR) $(@D) $(COMPONENT_DIR) $(COMPONENT_SRC) $(WS_LICENSES)
 
 MANIFEST_BASE =		$(BUILD_DIR)/manifest-$(MACH)
 
--- a/make-rules/shared-macros.mk	Mon Jun 15 17:59:44 2015 -0700
+++ b/make-rules/shared-macros.mk	Mon Jun 15 10:53:55 2015 -0700
@@ -55,6 +55,7 @@
 WS_TOOLS =	$(WS_TOP)/tools
 WS_MAKE_RULES =	$(WS_TOP)/make-rules
 WS_COMPONENTS =	$(WS_TOP)/components
+WS_LICENSES =	$(WS_TOP)/licenses
 WS_INCORPORATIONS =	$(WS_TOP)/incorporations
 WS_LINT_CACHE =	$(WS_MACH)/pkglint-cache
 
@@ -79,9 +80,9 @@
 
 SHELL=	/bin/bash
 
-# If we are building "pre-release" software for the Solaris release repository
+# If we are building "evaluation" software for the Solaris release repository
 # we want the PUBLISHER to be "solaris".
-ifeq ($(BUILD_TYPE),pre-release)
+ifeq ($(BUILD_TYPE),evaluation)
 PUBLISHER = solaris
 endif
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/transforms/evaluation	Mon Jun 15 10:53:55 2015 -0700
@@ -0,0 +1,3 @@
+<transform set name=pkg.description -> edit value (.*) "(EVALUATION) \1">
+depend type=require fmri=release/evaluation
+license evaluation license=evaluation
--- a/transforms/pre-release	Mon Jun 15 17:59:44 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-depend type=require fmri=release/pre-release