20853169 build should support pre-release requirements
authorJohn Beck <John.Beck@Oracle.COM>
Mon, 08 Jun 2015 13:06:14 -0700
changeset 4439 94148b6e4407
parent 4438 5c17d084f39b
child 4440 4d260a182755
20853169 build should support pre-release requirements
components/meta-packages/pre-release/Makefile
components/meta-packages/pre-release/pre-release.license
components/meta-packages/pre-release/pre-release.p5m
make-rules/ips.mk
make-rules/shared-macros.mk
transforms/pre-release
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/pre-release/Makefile	Mon Jun 08 13:06:14 2015 -0700
@@ -0,0 +1,36 @@
+#
+# 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
+
+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
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/pre-release/pre-release.license	Mon Jun 08 13:06:14 2015 -0700
@@ -0,0 +1,1 @@
+TBD pre-release software license goes here.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/pre-release/pre-release.p5m	Mon Jun 08 13:06:14 2015 -0700
@@ -0,0 +1,36 @@
+#
+# 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
--- a/make-rules/ips.mk	Fri Jun 05 13:54:25 2015 -0700
+++ b/make-rules/ips.mk	Mon Jun 08 13:06:14 2015 -0700
@@ -90,6 +90,13 @@
 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
+# 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
+endif
+
 PKG_MACROS +=		MACH=$(MACH)
 PKG_MACROS +=		MACH32=$(MACH32)
 PKG_MACROS +=		MACH64=$(MACH64)
--- a/make-rules/shared-macros.mk	Fri Jun 05 13:54:25 2015 -0700
+++ b/make-rules/shared-macros.mk	Mon Jun 08 13:06:14 2015 -0700
@@ -79,6 +79,12 @@
 
 SHELL=	/bin/bash
 
+# If we are building "pre-release" software for the Solaris release repository
+# we want the PUBLISHER to be "solaris".
+ifeq ($(BUILD_TYPE),pre-release)
+PUBLISHER = solaris
+endif
+
 # We want "nightly" as our publisher, to match other consolidations and
 # facilitate migrations.  G11N wants $(CONSOLIDATION)-localizable for
 # the localizable publisher.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/transforms/pre-release	Mon Jun 08 13:06:14 2015 -0700
@@ -0,0 +1,1 @@
+depend type=require fmri=release/pre-release