--- a/usr/src/cmd/distro_const/manifest/Makefile Fri Apr 22 14:56:31 2011 -0600
+++ b/usr/src/cmd/distro_const/manifest/Makefile Mon Apr 25 08:47:38 2011 -0600
@@ -36,7 +36,8 @@
dc_text_x86.xml \
dc_text_sparc.xml \
boot_archive_contents_x86.xml \
- boot_archive_contents_sparc.xml
+ boot_archive_contents_sparc.xml \
+ lang_facets.xml
ROOT_MANIFEST_FILES= $(MANIFEST_FILES:%=$(ROOTDC)/%)
--- a/usr/src/cmd/distro_const/manifest/dc_ai_sparc.xml Fri Apr 22 14:56:31 2011 -0600
+++ b/usr/src/cmd/distro_const/manifest/dc_ai_sparc.xml Mon Apr 25 08:47:38 2011 -0600
@@ -62,10 +62,8 @@
-->
<software name="transfer-ips-install" type="IPS">
<destination>
- <image img_root="{PKG_IMAGE_PATH}" action="create">
- <img_type completeness="full"/>
- <property val="true">flush-content-cache-on-success</property>
- </image>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="/usr/share/distro_const/lang_facets.xml"/>
</destination>
<source>
<publisher name="solaris">
--- a/usr/src/cmd/distro_const/manifest/dc_ai_x86.xml Fri Apr 22 14:56:31 2011 -0600
+++ b/usr/src/cmd/distro_const/manifest/dc_ai_x86.xml Mon Apr 25 08:47:38 2011 -0600
@@ -100,10 +100,8 @@
-->
<software name="transfer-ips-install" type="IPS">
<destination>
- <image img_root="{PKG_IMAGE_PATH}" action="create">
- <img_type completeness="full"/>
- <property val="true">flush-content-cache-on-success</property>
- </image>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="/usr/share/distro_const/lang_facets.xml"/>
</destination>
<source>
<publisher name="solaris">
--- a/usr/src/cmd/distro_const/manifest/dc_livecd.xml Fri Apr 22 14:56:31 2011 -0600
+++ b/usr/src/cmd/distro_const/manifest/dc_livecd.xml Mon Apr 25 08:47:38 2011 -0600
@@ -107,10 +107,8 @@
-->
<software name="transfer-ips-install" type="IPS">
<destination>
- <image img_root="{PKG_IMAGE_PATH}" action="create">
- <img_type completeness="full"/>
- <property val="true">flush-content-cache-on-success</property>
- </image>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="/usr/share/distro_const/lang_facets.xml"/>
</destination>
<source>
<publisher name="solaris">
--- a/usr/src/cmd/distro_const/manifest/dc_text_sparc.xml Fri Apr 22 14:56:31 2011 -0600
+++ b/usr/src/cmd/distro_const/manifest/dc_text_sparc.xml Mon Apr 25 08:47:38 2011 -0600
@@ -61,10 +61,8 @@
-->
<software name="transfer-ips-install" type="IPS">
<destination>
- <image img_root="{PKG_IMAGE_PATH}" action="create">
- <img_type completeness="full"/>
- <property val="true">flush-content-cache-on-success</property>
- </image>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="/usr/share/distro_const/lang_facets.xml"/>
</destination>
<source>
<publisher name="solaris">
--- a/usr/src/cmd/distro_const/manifest/dc_text_x86.xml Fri Apr 22 14:56:31 2011 -0600
+++ b/usr/src/cmd/distro_const/manifest/dc_text_x86.xml Mon Apr 25 08:47:38 2011 -0600
@@ -102,10 +102,8 @@
-->
<software name="transfer-ips-install" type="IPS">
<destination>
- <image img_root="{PKG_IMAGE_PATH}" action="create">
- <img_type completeness="full"/>
- <property val="true">flush-content-cache-on-success</property>
- </image>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="/usr/share/distro_const/lang_facets.xml"/>
</destination>
<source>
<publisher name="solaris">
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/distro_const/manifest/lang_facets.xml Mon Apr 25 08:47:38 2011 -0600
@@ -0,0 +1,50 @@
+<?xml version='1.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) 2011, Oracle and/or its affiliates. All rights reserved.
+
+ Basic package image properties for install images
+-->
+<image img_root="{PKG_IMAGE_PATH}" action="create">
+ <facet set="false">facet.locale.*</facet>
+ <facet set="true">facet.locale.de</facet>
+ <facet set="true">facet.locale.de_DE</facet>
+ <facet set="true">facet.locale.en</facet>
+ <facet set="true">facet.locale.en_US</facet>
+ <facet set="true">facet.locale.es</facet>
+ <facet set="true">facet.locale.es_ES</facet>
+ <facet set="true">facet.locale.fr</facet>
+ <facet set="true">facet.locale.fr_FR</facet>
+ <facet set="true">facet.locale.it</facet>
+ <facet set="true">facet.locale.it_IT</facet>
+ <facet set="true">facet.locale.ja</facet>
+ <facet set="true">facet.locale.ja_*</facet>
+ <facet set="true">facet.locale.ko</facet>
+ <facet set="true">facet.locale.ko_*</facet>
+ <facet set="true">facet.locale.pt</facet>
+ <facet set="true">facet.locale.pt_BR</facet>
+ <facet set="true">facet.locale.zh</facet>
+ <facet set="true">facet.locale.zh_CN</facet>
+ <facet set="true">facet.locale.zh_TW</facet>
+ <img_type completeness="full"/>
+ <property val="true">flush-content-cache-on-success</property>
+</image>
+
--- a/usr/src/pkg/manifests/install-distribution-constructor.mf Fri Apr 22 14:56:31 2011 -0600
+++ b/usr/src/pkg/manifests/install-distribution-constructor.mf Mon Apr 25 08:47:38 2011 -0600
@@ -86,6 +86,7 @@
file path=usr/share/distro_const/dc_text_sparc.xml mode=0444 group=sys
file path=usr/share/distro_const/boot_archive_contents_x86.xml mode=0444 group=sys
file path=usr/share/distro_const/boot_archive_contents_sparc.xml mode=0444 group=sys
+file path=usr/share/distro_const/lang_facets.xml mode=0444 group=sys
file path=usr/lib/python2.6/vendor-packages/solaris_install/distro_const/__init__.py mode=0444
file path=usr/lib/python2.6/vendor-packages/solaris_install/distro_const/__init__.pyc mode=0444
file path=usr/lib/python2.6/vendor-packages/solaris_install/distro_const/cli.py mode=0444