21028978 install all packages fails for pkgs added from sfw to userland incorpororation
authorCraig Mohrman <craig.mohrman@oracle.com>
Wed, 27 May 2015 17:12:47 -0700
changeset 4367 2f56a3dac19a
parent 4366 8e8f535e48a5
child 4370 7043c27399f1
21028978 install all packages fails for pkgs added from sfw to userland incorpororation 21029430 plugin-php52 should have been obsoleted with apache-php5
components/meta-packages/history/Makefile
components/meta-packages/history/sfw-incorporation.p5m
components/meta-packages/history/web-server-apache-22-plugin-plugin-php52.p5m
--- a/components/meta-packages/history/Makefile	Wed May 27 16:32:47 2015 -0700
+++ b/components/meta-packages/history/Makefile	Wed May 27 17:12:47 2015 -0700
@@ -48,14 +48,20 @@
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
-build install system-test:
+PKG_MACROS =		CONSOLIDATION=$(CONSOLIDATION)
+PKG_MACROS +=		BUILD_VERSION=$(BUILD_VERSION)
+PKG_MACROS +=		OS_VERSION=$(OS_VERSION)
+
+PKG_OPTIONS +=		$(PKG_MACROS:%=-D %)
+
+build install test system-test:
 	@echo "nothing to be done for [email protected]"
 
 $(BUILD_DIR):
 	$(MKDIR) [email protected]
 
 $(MANIFEST_BASE)-%.mogrified: %.p5m $(BUILD_DIR)
-	$(PKGMOGRIFY) -D CONSOLIDATION=$(CONSOLIDATION) $< \
+	$(PKGMOGRIFY) $(PKG_OPTIONS) $< \
 	              $(WS_TOP)/transforms/incorporate > [email protected]
 
 $(MANIFEST_BASE)-%.published: $(MANIFEST_BASE)-%.mogrified $(BUILD_DIR)
@@ -82,4 +88,3 @@
 	
 clobber clean::
 	$(RM) -r $(BUILD_DIR) $(GENERATED_ARCH_MANIFESTS)
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/history/sfw-incorporation.p5m	Wed May 27 17:12:47 2015 -0700
@@ -0,0 +1,270 @@
+#
+# 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:/consolidation/sfw/[email protected]$(OS_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="sfw consolidation incorporation"
+set name=pkg.description \
+    value="This incorporation constrains packages from the sfw consolidation."
+set name=pkg.depend.install-hold value=core-os.sfw
+set name=info.classification \
+    value="org.opensolaris.category.2008:Meta Packages/Incorporations"
+set name=org.opensolaris.consolidation incorporate=none value=sfw
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate [email protected]
+depend type=incorporate fmri=benchmark/[email protected]
+depend type=incorporate fmri=benchmark/[email protected]
+depend type=incorporate fmri=benchmark/[email protected]
+depend type=incorporate fmri=database/mysql-4/[email protected]
+depend type=incorporate fmri=database/[email protected]
+depend type=incorporate fmri=database/mysql-5/connector/[email protected]
+depend type=incorporate fmri=database/mysql-5/[email protected]
+depend type=incorporate fmri=database/mysql-50/connector/[email protected]
+depend type=incorporate fmri=database/mysql-50/[email protected]
+depend type=incorporate fmri=database/[email protected]
+depend type=incorporate fmri=database/[email protected]
+depend type=incorporate fmri=database/postgres-82/connector/[email protected]
+depend type=incorporate fmri=database/postgres-82/[email protected]
+depend type=incorporate fmri=database/postgres-82/[email protected]
+depend type=incorporate fmri=database/postgres-82/[email protected]
+depend type=incorporate fmri=database/postgres-82/[email protected]
+depend type=incorporate fmri=database/postgres-82/[email protected]
+depend type=incorporate fmri=database/postgres-82/[email protected]
+depend type=incorporate fmri=database/[email protected]
+depend type=incorporate fmri=database/postgres-83/connector/[email protected]
+depend type=incorporate fmri=database/postgres-83/[email protected]
+depend type=incorporate fmri=database/postgres-83/[email protected]
+depend type=incorporate fmri=database/postgres-83/[email protected]
+depend type=incorporate fmri=database/postgres-83/[email protected]
+depend type=incorporate fmri=database/postgres-83/[email protected]
+depend type=incorporate fmri=database/postgres-83/[email protected]
+depend type=incorporate fmri=database/postgres-83/[email protected]
+depend type=incorporate fmri=database/[email protected]
+depend type=incorporate fmri=database/postgres-84/[email protected]
+depend type=incorporate fmri=database/postgres-84/[email protected]
+depend type=incorporate fmri=database/postgres-84/[email protected]
+depend type=incorporate fmri=database/postgres-84/[email protected]
+depend type=incorporate fmri=database/postgres-84/[email protected]
+depend type=incorporate fmri=database/postgres-84/[email protected]
+depend type=incorporate fmri=database/[email protected]
+depend type=incorporate fmri=database/[email protected]
+depend type=incorporate fmri=database/postgres/library/c++/[email protected]
+depend type=incorporate fmri=database/postgres/[email protected]
+depend type=incorporate fmri=database/postgres/[email protected]
+depend type=incorporate fmri=database/postgres/[email protected]
+depend type=incorporate fmri=database/[email protected]
+depend type=incorporate fmri=developer/documentation-tool/[email protected]
+depend type=incorporate fmri=developer/[email protected]
+depend type=incorporate fmri=developer/[email protected]
+depend type=incorporate fmri=developer/parser/[email protected]
+depend type=incorporate fmri=diagnostic/[email protected]
+depend type=incorporate fmri=editor/[email protected]
+depend type=incorporate fmri=editor/[email protected]
+depend type=incorporate fmri=library/apr-util-13/[email protected]
+depend type=incorporate fmri=library/desktop/[email protected]
+depend type=incorporate fmri=library/[email protected]
+depend type=incorporate fmri=library/[email protected]
+depend type=incorporate fmri=library/java/[email protected]
+depend type=incorporate fmri=library/java/[email protected]
+depend type=incorporate fmri=library/java/[email protected]
+depend type=incorporate fmri=library/java/[email protected]
+depend type=incorporate fmri=library/java/[email protected]
+depend type=incorporate fmri=library/java/[email protected]
+depend type=incorporate fmri=library/java/[email protected]
+depend type=incorporate fmri=library/java/[email protected]
+depend type=incorporate fmri=library/java/[email protected]
+depend type=incorporate fmri=library/java/[email protected]
+depend type=incorporate fmri=library/java/[email protected]
+depend type=incorporate fmri=library/java/[email protected]
+depend type=incorporate fmri=library/java/[email protected]
+depend type=incorporate fmri=library/java/[email protected]
+depend type=incorporate fmri=library/java/[email protected]
+depend type=incorporate fmri=library/java/[email protected]
+depend type=incorporate fmri=library/java/[email protected]
+depend type=incorporate fmri=library/java/[email protected]
+depend type=incorporate fmri=library/java/[email protected]
+depend type=incorporate fmri=library/java/[email protected]
+depend type=incorporate fmri=library/java/[email protected]
+depend type=incorporate fmri=library/java/[email protected]
+depend type=incorporate fmri=library/java/[email protected]
+depend type=incorporate fmri=library/java/[email protected]
+depend type=incorporate fmri=library/java/[email protected]
+depend type=incorporate fmri=library/java/[email protected]
+depend type=incorporate fmri=library/java/[email protected]
+depend type=incorporate fmri=library/java/[email protected]
+depend type=incorporate fmri=library/[email protected]
+depend type=incorporate fmri=library/perl-5/[email protected]
+depend type=incorporate fmri=library/python-2/[email protected]
+depend type=incorporate fmri=library/python-2/[email protected]
+depend type=incorporate fmri=library/python-2/[email protected]
+depend type=incorporate fmri=network/[email protected]
+depend type=incorporate fmri=runtime/[email protected]
+depend type=incorporate fmri=runtime/java/[email protected]
+depend type=incorporate fmri=runtime/perl-510/[email protected]
+depend type=incorporate fmri=runtime/[email protected]
+depend type=incorporate fmri=runtime/tcl-8/[email protected]
+depend type=incorporate fmri=service/database/[email protected]
+depend type=incorporate fmri=service/database/[email protected]
+depend type=incorporate fmri=service/database/[email protected]
+depend type=incorporate fmri=service/network/load-balancer/[email protected]
+depend type=incorporate fmri=service/network/sip/ser/[email protected]
+depend type=incorporate fmri=service/network/sip/[email protected]
+depend type=incorporate fmri=shell/[email protected]
+depend type=incorporate fmri=shell/[email protected]
+depend type=incorporate fmri=system/management/[email protected]
+depend type=incorporate fmri=system/management/wbem/[email protected]
+depend type=incorporate fmri=system/management/[email protected]
+depend type=incorporate fmri=terminal/[email protected]
+depend type=incorporate fmri=text/[email protected]
+depend type=incorporate fmri=text/[email protected]
+depend type=incorporate fmri=web/[email protected]
+depend type=incorporate fmri=web/analytics/[email protected]
+depend type=incorporate \
+    fmri=web/library/apache/apr-util-13/[email protected]
+depend type=incorporate fmri=web/php-52/extension/[email protected]
+depend type=incorporate fmri=web/server/apache-13/[email protected]
+depend type=incorporate fmri=web/server/[email protected]
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/history/web-server-apache-22-plugin-plugin-php52.p5m	Wed May 27 17:12:47 2015 -0700
@@ -0,0 +1,27 @@
+#
+# 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:/web/server/apache-22/plugin/[email protected],5.12-5.12.0.0.0.76.0
+set name=pkg.obsolete value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)