--- a/.hgignore Fri May 21 08:53:04 2010 -0600
+++ b/.hgignore Mon May 24 17:31:06 2010 -0400
@@ -12,6 +12,7 @@
^packages
^webrev
^log
+^usr/src/pkg/packages\..*
pkgdefs.*/copyright
pkgdefs.*/pkginfo
usr/src/lib/.*\.a
--- a/usr/src/Makefile Fri May 21 08:53:04 2010 -0600
+++ b/usr/src/Makefile Mon May 24 17:31:06 2010 -0400
@@ -20,9 +20,7 @@
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
#
#
@@ -49,7 +47,7 @@
all install: headers .WAIT man .WAIT lib .WAIT cmd .WAIT pkgs
-clean clobber lint: $(SUBDIRS) pkgdefs
+clean clobber lint: $(SUBDIRS) pkg pkgdefs
proto: headers
@@ -63,7 +61,7 @@
build-tools:
@cd tools; pwd; $(MAKE) install
-$(SUBDIRS) pkgdefs: FRC
+$(SUBDIRS) pkg pkgdefs: FRC
@cd $@; pwd; $(MAKE) $(TARGET)
$(SRC)/pkgdefs/awk_pkginfo:
@@ -79,6 +77,7 @@
pkgs:
@cd $(SRC)/pkgdefs; pwd; $(MAKE) install
+ @cd $(SRC)/pkg; pwd; $(MAKE) install
# Build the TAGS file for etags, the Emacs cross-referencer
ETAGS=etags
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/Makefile.buildnum Mon May 24 17:31:06 2010 -0400
@@ -0,0 +1,39 @@
+#
+# 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) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+#
+# This file has no user serviceable parts. It is maintained
+# automatically by gatekeeper scripts that run at build close.
+#
+# If you need to override this value, do not edit it here. Instead,
+# set INSTALL_BUILDNUM in your build environment. If you do this, it must
+# be an integer, and your choice will have ramifications on whether or
+# not the package repositories you build will be upgradeable.
+#
+# The INSTALL_BUILDNUM macro should, at any point in time, represent the
+# currently open build in the slim_source repository.
+#
+
+INSTALL_BUILDNUM= 141
--- a/usr/src/Makefile.master Fri May 21 08:53:04 2010 -0600
+++ b/usr/src/Makefile.master Mon May 24 17:31:06 2010 -0400
@@ -20,8 +20,7 @@
#
#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
#
#
@@ -71,6 +70,7 @@
GNUXGETTEXT= /usr/gnu/bin/xgettext
GNUXGETFLAGS= --keyword=_ --strict --no-location --omit-header
CSTYLE= cstyle -pP
+NAWK= /usr/bin/nawk
# Reference paths for ON
ONLIBDIR= $(ONREF_PROTO)/lib
@@ -109,6 +109,8 @@
ROOTUSRBIN= $(ROOT)/usr/bin
ROOTUSRSHARE= $(ROOT)/usr/share
ROOTUSRSHARETI= $(ROOTUSRSHARE)/text-install
+ROOTUSRSHARETIHELP= $(ROOTUSRSHARETI)/help
+ROOTUSRSHARETIHELPC= $(ROOTUSRSHARETI)/help/C
ROOTUSRLIB= $(ROOT)/usr/lib
ROOTUSRLIBMSGS= $(ROOTUSRLIB)/locale/C/LC_MESSAGES
ROOTUSRSBIN= $(ROOT)/usr/sbin
@@ -228,15 +230,31 @@
# to get around the make **bug** that '#' is always a comment delimiter,
# even when escaped of quoted.
#
+POUND_SIGN:sh= /usr/bin/echo \\043
-POUND_SIGN:sh= /usr/bin/echo \\043
-VERSION= SNAG Development
-RELEASE= SunOS
-RELEASE_DATE:sh= date "+%B %Y"
-BUILD_DATE:sh= date "+%D"
-
-RELEASE_CM= "@($(POUND_SIGN))$(RELEASE) $(VERSION). $(RELEASE_DATE)"
-DEV_CM= "@($(POUND_SIGN))SNAG Internal Development: $(LOGNAME) $(BUILD_DATE)"
+# The following list of macros are used in the definition of RELEASE_CM
+# which is used to label all binaries in the build:
+#
+# RELEASE Specific release of the build, eg: 5.2
+# RELEASE_MAJOR Major version number part of $(RELEASE)
+# RELEASE_MINOR Minor version number part of $(RELEASE)
+# VERSION Version of the build (alpha, beta, Generic)
+# PATCHID If this is a patch this value should contain
+# the patchid value (eg: "Generic 100832-01"), otherwise
+# it will be set to $(VERSION)
+# RELEASE_DATE Date of the Release Build
+# PATCH_DATE Date the patch was created, if this is blank it
+# will default to the RELEASE_DATE
+#
+RELEASE_MAJOR= 5
+RELEASE_MINOR= 11
+RELEASE= $(RELEASE_MAJOR).$(RELEASE_MINOR)
+VERSION= SunOS Installation Development
+PATCHID= $(VERSION)
+RELEASE_DATE= release date not set
+PATCH_DATE= $(RELEASE_DATE)
+RELEASE_CM= "@($(POUND_SIGN))SunOS $(RELEASE) $(PATCHID) $(PATCH_DATE)"
+DEV_CM= "@($(POUND_SIGN))SunOS Internal Development: non-nightly build"
PROCESS_COMMENT= @?mcs -d -a $(RELEASE_CM) -a $(DEV_CM)
$(RELEASE_BUILD)PROCESS_COMMENT= @?mcs -d -a $(RELEASE_CM)
@@ -249,6 +267,15 @@
$(RELEASE_BUILD)POST_PROCESS= $(PROCESS_COMMENT) $@ ;\
strip $@
+#
+# The repositories will be created with these publisher settings. To
+# update an image to the resulting repositories, this must match the
+# publisher name provided to "pkg set-publisher."
+#
+PKGPUBLISHER_REDIST= install-nightly
+PKGPUBLISHER_NONREDIST= install-extra
+
+
# Default build rules which perform comment section post-processing.
#
.c:
--- a/usr/src/Targetdirs Fri May 21 08:53:04 2010 -0600
+++ b/usr/src/Targetdirs Mon May 24 17:31:06 2010 -0400
@@ -18,8 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
#
#
# The list is built of owner-group combinations.
@@ -32,6 +31,8 @@
ROOT.SYS= \
/etc \
+ /etc/gconf \
+ /etc/gconf/schemas \
/etc/svc \
/etc/svc/profile \
/mnt \
@@ -77,6 +78,10 @@
/usr/share/distro_const/vmc \
/usr/share/doc \
/usr/share/doc/distro_const \
+ /usr/share/gui-install \
+ /usr/share/gui-install/help \
+ /usr/share/gui-install/help/C \
+ /usr/share/gui-install/installmessages \
/usr/share/lib \
/usr/share/lib/xml \
/usr/share/lib/xml/rng \
@@ -85,6 +90,8 @@
/usr/share/man/man1m \
/usr/share/man/man4 \
/usr/share/text-install \
+ /usr/share/text-install/help \
+ /usr/share/text-install/help/C \
/usr/snadm \
/usr/snadm/bin
--- a/usr/src/cmd/Makefile Fri May 21 08:53:04 2010 -0600
+++ b/usr/src/cmd/Makefile Mon May 24 17:31:06 2010 -0400
@@ -20,8 +20,7 @@
#
#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
#
#
@@ -30,7 +29,7 @@
include $(SRC)/Makefile.master
-SUBDIRS= auto-install gui-install installadm rbac slim-install
+SUBDIRS= auto-install gui-install gui-aux installadm rbac slim-install
PYTHONSUBDIRS= ai-webserver beadm distro_const text-install
TOOLSSUBDIRS= install-tools
--- a/usr/src/cmd/Makefile.cmd Fri May 21 08:53:04 2010 -0600
+++ b/usr/src/cmd/Makefile.cmd Mon May 24 17:31:06 2010 -0400
@@ -20,8 +20,7 @@
#
#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
#
include $(SRC)/Makefile.master
@@ -32,18 +31,14 @@
ROOTEXECATTR = $(ROOT)/etc/security/exec_attr.d
ROOTLIBSVCMETHOD = $(ROOT)/lib/svc/method
ROOTLIBSVCSHARE = $(ROOT)/lib/svc/share
-ROOTMANIFEST = $(ROOT)/var/svc/manifest
+ROOTMANIFEST = $(ROOTVAR)/svc/manifest
ROOTMANAPP = $(ROOTMANIFEST)/application
ROOTMANSYS = $(ROOTMANIFEST)/system
ROOTMANSYSFIL = $(ROOTMANSYS)/filesystem
ROOTMANSYSSVC = $(ROOTMANSYS)/svc
ROOTMANSYSINS = $(ROOTMANSYS)/install
ROOTPROFATTR = $(ROOT)/etc/security/prof_attr.d
-ROOTSBIN = $(ROOT)/sbin
-ROOTUSRLIB = $(ROOT)/usr/lib
ROOTUSRLIBINSTALLADM = $(ROOT)/usr/lib/installadm
-ROOTUSRBIN = $(ROOT)/usr/bin
-ROOTUSRSBIN = $(ROOT)/usr/sbin
ROOTVARSADM = $(ROOT)/var/sadm
ROOTVARINSTADM = $(ROOT)/var/installadm
ROOTVARAIWEB = $(ROOT)/var/installadm/ai-webserver
@@ -52,10 +47,8 @@
# Derived installation rules
ROOTUSRBINPROG = $(PROG:%=$(ROOTUSRBIN)/%)
-ROOTUSRSBINPROG = $(PROG:%=$(ROOTUSRSBIN)/%)
ROOTUSRSBINFILES = $(FILES:%=$(ROOTUSRSBIN)/%)
-ROOTSBINPROG = $(PROG:%=$(ROOTSBIN)/%)
ROOTSBINFILES = $(FILES:%=$(ROOTSBIN)/%)
ROOTEXECATTRFILES = $(EXECATTRFILES:exec_attr.%=$(ROOTEXECATTR)/%)
--- a/usr/src/cmd/Makefile.targ Fri May 21 08:53:04 2010 -0600
+++ b/usr/src/cmd/Makefile.targ Mon May 24 17:31:06 2010 -0400
@@ -20,8 +20,7 @@
#
#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
#
$(ROOT)/%: %
@@ -160,7 +159,7 @@
$(ROOTUSRSBIN)/%: %
$(INS.file)
-$(ROOTUSRSHARETI)/%: %
+$(ROOTUSRSHARETIHELPC)/%: %
$(INS.file)
$(ROOTUSRLIBINSTALLADM)/%: %
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/gui-aux/FINISH_PANEL.txt Mon May 24 17:31:06 2010 -0400
@@ -0,0 +1,14 @@
+Finish
+
+
+After the installation is complete, this panel provides a link to a summary log for your review.
+
+Procedure
+
+You can either quit or reboot from this panel.
+
+ * After a successful installation, to start the installed system, select Reboot. The reboot process might take a few minutes.
+
+ Note – Eject the Live CD as the next boot begins. Or, select the "Boot from Hard Disk" option on the GRUB menu.
+
+ * To exit, select Quit and shutdown your system.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/gui-aux/INSTALL_DISK_PANEL.txt Mon May 24 17:31:06 2010 -0400
@@ -0,0 +1,82 @@
+Disks and Partitioning
+
+
+This panel displays internal disks, external disks, and non-traditional "disks," including storage cards, that are available on the system. When a disk is selected in this panel, the existing partitions for that disk are displayed. This panel enables you to choose a disk, or a partition on a disk, for the installation.
+
+The panel also enables you to make adjustments to the fdisk partition layout, such as deleting existing partitions, creating and sizing an extended partition, and creating and sizing a Solaris partition.
+
+Recommended size and minimum size for the OpenSolaris OS installation are displayed in this panel.
+
+Note the following:
+
+ * In order to be recognized by the installer, the external disks must be plugged in when the installer begins.
+
+ * The installer provides limited partitioning support as described below. For more complex partitioning needs, use a partition management application, such as GParted. GParted is available on the OpenSolaris desktop. In the Applications menu on the desktop, see System Tools.
+
+ * The installer uses the selected disk or partition to create a ZFS storage pool. If a second disk is available, you can, after the installed system has been booted, add a second disk to the ZFS pool to create a mirrored configuration. This second disk would need to be as large or larger than the installation target.
+
+ * At any point, you can select the Reset button in this screen to revert to the original partitioning settings.
+
+Procedure
+
+1. Select a disk.
+
+ For details about a disk, move the cursor over the disk icon. A popup window provides disk specifications. Disks that are too small for a successful installation are labeled as such.
+
+2. Select either "Use the whole disk" or "Partition the disk."
+
+ If you selected "Use the whole disk", you can press Next and go to the next panel. If you selected "Partition the disk," continue with the following steps as needed.
+
+ CAUTION: If you select "Use the whole disk", the entire disk will be erased during the installation and overwritten with the new OpenSolaris OS.
+
+ CAUTION: If you select "Partition the disk", and the existing partition table cannot be read, the panel displays proposed partitioning. In this case, all data on the disk will be destroyed during the installation.
+
+3. Set up a Solaris partition to use for the installation or accept the default.
+
+ Note the following:
+
+ Only one Solaris partition is allowed, and a Solaris partition must be used for the installation.
+
+ When you select "Partition the disk," the panel displays the existing fdisk partitions for the selected disk. Up to four primary partitions are displayed in the same order as they are laid out on the disk. Unused space is displayed for these primary partitions. The partition type, current size, and maximum available space for each partition are displayed. If an extended partition exists, its logical partitions are displayed in the disk layout order within the extended partition.
+
+ If there is an existing Solaris partition, that partition is selected by default. The Solaris partition could be a logical partition within an existing extended partition.
+
+Select from the following options to accept or revise the Solaris partition setup:
+
+ * You can use the existing Solaris partition with the current size.
+
+ * If there is available space, you can enlarge the default Solaris partition or the new Solaris partition that you set up.
+
+ Note: The available space contains any contiguous unused space before or after the selected partition. If you enlarge the partition, unused space after the partition is used first. Then, unused space before the partition is used, changing the starting cylinder of the selected partition.
+
+ * If there is no existing Solaris partition, you must select a primary partition or a logical partition and change its type to Solaris by changing the dropdown menu selection for that partition to Solaris. During installation, this modifcation erases the existing partition contents.
+
+ * If you want to install to a different primary partition, you must first delete the existing Solaris partition by changing its type to Unused in the dropdown menu. Then, you can select another partition and change its type to Solaris in the dropdown menu. During installation, this modification erases the existing partition contents.
+
+ * If you want to create a new Solaris partition within an extended partition, the procedure is similar to the basic procedure described in the prior bullet. First, delete the existing Solaris partition, if one exists, by changing its type to Unused in the dropdown menu. Then, create a new extended partition, if one does not exist, by changing the partition type to Extended in the dropdown menu. You can resize the extended partition. Then, change one of the logical partitions in the extended partition to a Solaris partition. You can enlarge the logical partition up to the size of the containing extended partition.
+
+ * LINUX-SWAP INSTRUCTIONS: If you used a third-party partitioning tool such as GParted, then this screen displays a partition named Linux-swap on which you can install the OpenSolaris OS. Change the Linux-swap partition type in the dropdown box to Solaris.
+
+4. Optional: After you have set up your Solaris partition, you can further modify the overall partition layout, using any of the following options.
+
+ Note: The changes you make will be implemented during the installation. You can cancel your modifications by pressing the Reset button.
+
+ CAUTION: If you reduce a partition size or change it's type, the existing partition contents will be erased during installation. Otherwise, existing partition contents are preserved during installation.
+
+ * You can resize a Solaris partition by typing a new size, up to the displayed available space, for that partition.
+
+ * You can create one extended partition, if one does not already exist, by changing the existing partition type to Extended in the dropdown menu. Only one extended partition is allowed. You can resize the extended partition.
+
+ * You can delete any partitions by changing the partition type dropdown selection to Unused. During installation, the existing partition contents is erased and the resultant unused space is made available to adjacent partitions.
+
+5. When you have completed your selections, press Next to continue.
+
+
+
+
+
+
+
+
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/gui-aux/INSTALL_FAILURE_PANEL.txt Mon May 24 17:31:06 2010 -0400
@@ -0,0 +1,13 @@
+Installation Failed
+
+
+This panel displays if the OpenSolaris OS installation failed.
+
+
+Procedures
+
+1. Optional: Select the link to view the installation log in a separate window.
+
+2. Select Quit to exit this panel.
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/gui-aux/INSTALL_LANGUAGE_PANEL.txt Mon May 24 17:31:06 2010 -0400
@@ -0,0 +1,14 @@
+Locale
+
+
+This panel enables you to select language support and locale. These selections determine the language support, the default date and time, and other data formats for the installed system.
+
+Guidelines
+
+* You can accept the default language selection or change the selection.
+
+* A language selection is required. You can select "no default language support."
+
+* The language chosen automatically determines the available locales in the dropdown box. Only one locale can be selected.
+
+Note: Anytime you log in to the installed system, you can change either the locale for that particular session or the default locale. In the login screen, select the Options button and then choose Select language.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/gui-aux/INSTALL_PROGRESS_PANEL.txt Mon May 24 17:31:06 2010 -0400
@@ -0,0 +1,7 @@
+Installing
+
+
+A progress bar displays during the installation of the OpenSolaris OS.
+
+
+CAUTION: Do not interrupt an installation in progress.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/gui-aux/INSTALL_REVIEW_PANEL.txt Mon May 24 17:31:06 2010 -0400
@@ -0,0 +1,16 @@
+Installation
+
+
+This panel enables you to review and confirm installation specifications.
+
+
+Procedure
+
+1. Review your installation selections.
+
+2. Optional: Use the back button to make changes.
+
+3. Click Install. A progress bar displays during the installation.
+
+ CAUTION: The installation begins when you click Install. Do not interrupt an installation in progress.
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/gui-aux/INSTALL_TIMEZONE_PANEL.txt Mon May 24 17:31:06 2010 -0400
@@ -0,0 +1,22 @@
+Time Zone, Date and Time
+
+
+This panel enables you to enter the correct time zone, date, and time for the system to be installed. Select a time zone or location where the computer is typically used.
+
+The top half of the panel displays a world map with major cities marked. The bottom half of the panel provides dropdown selections. You can choose the time zone either from the map or from the dropdown list. If you select a time zone from the map, your selection automatically is entered in the dropdown list.
+
+Procedure
+
+OPTION 1: Select the time zone from the map. You can either click on a city or click anywhere on the map.
+
+ If you click on the map, but not on a city, the map automatically magnifies that area. You can click on a location within that magnified area. You can drag the cursor to move the magnified area to a different location on the map. You can right-click to deselect magnification.
+
+ When you select a site on the map, the dropdown selections are automatically updated with the time zone, date, and current time for that map selection.
+
+OPTION 2: Instead of using the map, you can make your selections in the dropdown fields.
+
+ 1. Select your region, then select Location. Finally, select time zone. The options for each dropdown are determined by the selection made in the prior dropdown.
+
+ 2. Optional: You can edit the default date and time that is provided.
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/gui-aux/INSTALL_USERS_PANEL.txt Mon May 24 17:31:06 2010 -0400
@@ -0,0 +1,20 @@
+Users
+
+
+In this panel, you will define a user account and enter a computer name.
+
+
+For the user account fields:
+
+ * A user account is required.
+
+ * To complete the user account, the Log-in name and password are required.
+
+ * The Log-in name must begin with a letter and can contain only letters and numbers.
+
+For the computer name field:
+
+ * Enter a computer name or accept the default. The computer name field cannot be blank.
+
+If invalid information is provided, error messages are displayed.
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/gui-aux/Makefile Mon May 24 17:31:06 2010 -0400
@@ -0,0 +1,74 @@
+#
+# 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) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+include ../Makefile.cmd
+
+HELPFILES= \
+ FINISH_PANEL.txt \
+ INSTALL_DISK_PANEL.txt \
+ INSTALL_FAILURE_PANEL.txt \
+ INSTALL_LANGUAGE_PANEL.txt \
+ INSTALL_PROGRESS_PANEL.txt \
+ INSTALL_REVIEW_PANEL.txt \
+ INSTALL_TIMEZONE_PANEL.txt \
+ INSTALL_USERS_PANEL.txt \
+ UPGRADE_DISK_PANEL.txt \
+ UPGRADE_FAILURE_PANEL.txt \
+ UPGRADE_PROGRESS_PANEL.txt \
+ UPGRADE_REVIEW_PANEL.txt \
+ WELCOME_PANEL.txt
+
+PNGFILES= \
+ install-01.png \
+ install-02.png \
+ install-03.png \
+ install-04.png \
+ install-05.png
+
+SCHEMAFILES= solaris-gui-install.schemas
+
+ROOTHELPFILES= $(HELPFILES:%=$(ROOTUSRSHARE)/gui-install/help/C/%)
+
+ROOTPNGFILES= $(PNGFILES:%=$(ROOTUSRSHARE)/gui-install/installmessages/%)
+
+ROOTSCHEMAFILES= $(SCHEMAFILES:%=$(ROOT)/etc/gconf/schemas/%)
+
+all:
+
+install: all $(ROOTHELPFILES) $(ROOTPNGFILES) $(ROOTSCHEMAFILES)
+
+install_h:
+
+$(ROOTUSRSHARE)/gui-install/help/C/%: %
+ $(INS.file)
+
+$(ROOTUSRSHARE)/gui-install/installmessages/%: %
+ $(INS.file)
+
+$(ROOT)/etc/gconf/schemas/%: %
+ $(INS.file)
+
+clobber clean:
+
+include ../Makefile.targ
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/gui-aux/UPGRADE_DISK_PANEL.txt Mon May 24 17:31:06 2010 -0400
@@ -0,0 +1,18 @@
+Disk
+
+This panel displays the internal disks, external disks, and solid-state drives that are available on the system. This panel also displays the size of each disk in gigabytes. This panel enables you to choose a disk for the upgrade.
+
+Note: In order to be recognized by the installer, the disks and solid-state drives must be turned on at the time the computer boots.
+
+Definition
+
+ An upgrade of the Solaris OS merges the new version of the Solaris OS with the existing files on the system's disk or disks. An upgrade saves as many modifications as possible that you have made to the previous version of the Solaris OS.
+
+
+Guidelines
+
+ * For details about a disk, move the cursor over the disk icon. A popup box provides disk specifications.
+
+ * Solaris OS releases that are too old for upgrade are noted as such and cannot be selected.
+
+ * Developer tools are not upgraded. You can manually upgrade these tools after the installation.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/gui-aux/UPGRADE_FAILURE_PANEL.txt Mon May 24 17:31:06 2010 -0400
@@ -0,0 +1,32 @@
+Upgrade Failed
+
+
+This panel displays if the Solaris OS upgrade failed.
+
+
+Procedures
+
+Choose from the following alternatives:
+
+ * Select View Log to view the installation log in a separate window.
+
+
+ * Select Close to exit this panel. A terminal window opens to provide command-line access. You can use the command line to explore the cause of failure, reboot, or restart the installer.
+
+ Options include:
+
+ * Reboot the system:
+
+ % reboot
+
+ * Restart the installer:
+
+ % install-solaris
+
+ * View installation logs at the following locations:
+
+ /a/var/sadm/system/logs/install_log
+ /a/var/sadm/system/logs/upgrade_log
+ /a/var/sadm/system/logs/sysidtool.log
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/gui-aux/UPGRADE_PROGRESS_PANEL.txt Mon May 24 17:31:06 2010 -0400
@@ -0,0 +1,12 @@
+Upgrading
+
+A progress bar displays during the installation of the Solaris OS.
+
+
+Guidelines
+
+ * Solaris information messages display during the installation. The message changes once per minute.
+
+ * Use the arrow keys to move forward and backward through the messages.
+
+ WARNING: Terminating the upgrade leaves the disk in an indeterminate state.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/gui-aux/UPGRADE_REVIEW_PANEL.txt Mon May 24 17:31:06 2010 -0400
@@ -0,0 +1,22 @@
+Upgrade
+
+This panel enables you to review and confirm upgrade specifications and the license agreement.
+
+
+Procedure
+
+1. Review your upgrade selections.
+
+2. (Optional) Use the back button to make changes.
+
+3. Review and accept the license agreement.
+
+4. Click Upgrade.
+
+ WARNING: The upgrade begins when you click Upgrade. You cannot stop the upgrade after this point.
+
+ Note: If you do not accept the license and you select Upgrade, a dialog box asks for license acceptance.
+
+ * If you click Cancel in this dialog box, the installer returns to the Review panel.
+
+ * If you click Accept in this dialog box, the installation begins.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/gui-aux/WELCOME_PANEL.txt Mon May 24 17:31:06 2010 -0400
@@ -0,0 +1,17 @@
+Welcome to the OpenSolaris Installer
+
+
+This screen enables you to initiate an interactive installation of the OpenSolaris Operating System (OS).
+
+CAUTION: This installation overwrites the whole disk if one of the following is true.
+ a) You are installing to the whole disk.
+ b) The disk was not previously partitioned.
+However, if you choose to install to a Solaris partition on the disk, the installation can be set to overwrite only that partition. Other existing partitions need not be changed.
+
+To view the online help for any screen in this installer, select the Help, "?", button on that installer panel. For complete installation instructions, select the Getting Started With OpenSolaris icon on the Live CD desktop and refer to the section in that Getting Started document that covers installing to your system. This Getting Started document also includes a link to the current Release Notes.
+
+CAUTION: This installation does not upgrade an existing OpenSolaris OS. Instead, this installation of the OpenSolaris OS overwrites an existing Solaris or OpenSolaris OS with the new version of the OpenSolaris OS. If you want to upgrade an existing OpenSolaris OS, use the pkg(1) command or the Package Manager application instead of this installer. For upgrade instructions, select the Getting Started With OpenSolaris icon on the Live CD desktop, and refer to the section in that Getting Started document that covers upgrading your system.
+
+Note: You can choose to end the installation on any panel by selecting the Quit button.
+
+
Binary file usr/src/cmd/gui-aux/install-01.png has changed
Binary file usr/src/cmd/gui-aux/install-02.png has changed
Binary file usr/src/cmd/gui-aux/install-03.png has changed
Binary file usr/src/cmd/gui-aux/install-04.png has changed
Binary file usr/src/cmd/gui-aux/install-05.png has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/gui-aux/solaris-gui-install.schemas Mon May 24 17:31:06 2010 -0400
@@ -0,0 +1,53 @@
+<!--
+ Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ Use is subject to license terms.
+
+
+ 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 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
+-->
+<gconfschemafile>
+ <schemalist>
+ <schema>
+ <key>/schemas/apps/solaris-gui-install/windowwidth</key>
+ <applyto>/apps/solaris-gui-install/windowwidth</applyto>
+ <owner>gui-install</owner>
+ <type>int</type>
+ <default>890</default>
+ <locale name="C">
+ <short>The default window width</short>
+ <long>The default width in pixels of the new Solaris installer GUI.</long>
+ <default>890</default>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/apps/solaris-gui-install/windowheight</key>
+ <applyto>/apps/solaris-gui-install/windowheight</applyto>
+ <owner>gui-install</owner>
+ <type>int</type>
+ <default>690</default>
+ <locale name="C">
+ <short>The default window height.</short>
+ <long>The default width in pixels of the new Solaris installer GUI.</long>
+ <default>690</default>
+ </locale>
+ </schema>
+ </schemalist>
+</gconfschemafile>
--- a/usr/src/cmd/gui-install/data/FINISH_PANEL.txt Fri May 21 08:53:04 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-Finish
-
-
-After the installation is complete, this panel provides a link to a summary log for your review.
-
-Procedure
-
-You can either quit or reboot from this panel.
-
- * After a successful installation, to start the installed system, select Reboot. The reboot process might take a few minutes.
-
- Note – Eject the Live CD as the next boot begins. Or, select the "Boot from Hard Disk" option on the GRUB menu.
-
- * To exit, select Quit and shutdown your system.
--- a/usr/src/cmd/gui-install/data/INSTALL_DISK_PANEL.txt Fri May 21 08:53:04 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-Disks and Partitioning
-
-
-This panel displays internal disks, external disks, and non-traditional "disks," including storage cards, that are available on the system. When a disk is selected in this panel, the existing partitions for that disk are displayed. This panel enables you to choose a disk, or a partition on a disk, for the installation.
-
-The panel also enables you to make adjustments to the fdisk partition layout, such as deleting existing partitions, creating and sizing an extended partition, and creating and sizing a Solaris partition.
-
-Recommended size and minimum size for the OpenSolaris OS installation are displayed in this panel.
-
-Note the following:
-
- * In order to be recognized by the installer, the external disks must be plugged in when the installer begins.
-
- * The installer provides limited partitioning support as described below. For more complex partitioning needs, use a partition management application, such as GParted. GParted is available on the OpenSolaris desktop. In the Applications menu on the desktop, see System Tools.
-
- * The installer uses the selected disk or partition to create a ZFS storage pool. If a second disk is available, you can, after the installed system has been booted, add a second disk to the ZFS pool to create a mirrored configuration. This second disk would need to be as large or larger than the installation target.
-
- * At any point, you can select the Reset button in this screen to revert to the original partitioning settings.
-
-Procedure
-
-1. Select a disk.
-
- For details about a disk, move the cursor over the disk icon. A popup window provides disk specifications. Disks that are too small for a successful installation are labeled as such.
-
-2. Select either "Use the whole disk" or "Partition the disk."
-
- If you selected "Use the whole disk", you can press Next and go to the next panel. If you selected "Partition the disk," continue with the following steps as needed.
-
- CAUTION: If you select "Use the whole disk", the entire disk will be erased during the installation and overwritten with the new OpenSolaris OS.
-
- CAUTION: If you select "Partition the disk", and the existing partition table cannot be read, the panel displays proposed partitioning. In this case, all data on the disk will be destroyed during the installation.
-
-3. Set up a Solaris partition to use for the installation or accept the default.
-
- Note the following:
-
- Only one Solaris partition is allowed, and a Solaris partition must be used for the installation.
-
- When you select "Partition the disk," the panel displays the existing fdisk partitions for the selected disk. Up to four primary partitions are displayed in the same order as they are laid out on the disk. Unused space is displayed for these primary partitions. The partition type, current size, and maximum available space for each partition are displayed. If an extended partition exists, its logical partitions are displayed in the disk layout order within the extended partition.
-
- If there is an existing Solaris partition, that partition is selected by default. The Solaris partition could be a logical partition within an existing extended partition.
-
-Select from the following options to accept or revise the Solaris partition setup:
-
- * You can use the existing Solaris partition with the current size.
-
- * If there is available space, you can enlarge the default Solaris partition or the new Solaris partition that you set up.
-
- Note: The available space contains any contiguous unused space before or after the selected partition. If you enlarge the partition, unused space after the partition is used first. Then, unused space before the partition is used, changing the starting cylinder of the selected partition.
-
- * If there is no existing Solaris partition, you must select a primary partition or a logical partition and change its type to Solaris by changing the dropdown menu selection for that partition to Solaris. During installation, this modifcation erases the existing partition contents.
-
- * If you want to install to a different primary partition, you must first delete the existing Solaris partition by changing its type to Unused in the dropdown menu. Then, you can select another partition and change its type to Solaris in the dropdown menu. During installation, this modification erases the existing partition contents.
-
- * If you want to create a new Solaris partition within an extended partition, the procedure is similar to the basic procedure described in the prior bullet. First, delete the existing Solaris partition, if one exists, by changing its type to Unused in the dropdown menu. Then, create a new extended partition, if one does not exist, by changing the partition type to Extended in the dropdown menu. You can resize the extended partition. Then, change one of the logical partitions in the extended partition to a Solaris partition. You can enlarge the logical partition up to the size of the containing extended partition.
-
- * LINUX-SWAP INSTRUCTIONS: If you used a third-party partitioning tool such as GParted, then this screen displays a partition named Linux-swap on which you can install the OpenSolaris OS. Change the Linux-swap partition type in the dropdown box to Solaris.
-
-4. Optional: After you have set up your Solaris partition, you can further modify the overall partition layout, using any of the following options.
-
- Note: The changes you make will be implemented during the installation. You can cancel your modifications by pressing the Reset button.
-
- CAUTION: If you reduce a partition size or change it's type, the existing partition contents will be erased during installation. Otherwise, existing partition contents are preserved during installation.
-
- * You can resize a Solaris partition by typing a new size, up to the displayed available space, for that partition.
-
- * You can create one extended partition, if one does not already exist, by changing the existing partition type to Extended in the dropdown menu. Only one extended partition is allowed. You can resize the extended partition.
-
- * You can delete any partitions by changing the partition type dropdown selection to Unused. During installation, the existing partition contents is erased and the resultant unused space is made available to adjacent partitions.
-
-5. When you have completed your selections, press Next to continue.
-
-
-
-
-
-
-
-
-
-
--- a/usr/src/cmd/gui-install/data/INSTALL_FAILURE_PANEL.txt Fri May 21 08:53:04 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-Installation Failed
-
-
-This panel displays if the OpenSolaris OS installation failed.
-
-
-Procedures
-
-1. Optional: Select the link to view the installation log in a separate window.
-
-2. Select Quit to exit this panel.
-
-
--- a/usr/src/cmd/gui-install/data/INSTALL_LANGUAGE_PANEL.txt Fri May 21 08:53:04 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-Locale
-
-
-This panel enables you to select language support and locale. These selections determine the language support, the default date and time, and other data formats for the installed system.
-
-Guidelines
-
-* You can accept the default language selection or change the selection.
-
-* A language selection is required. You can select "no default language support."
-
-* The language chosen automatically determines the available locales in the dropdown box. Only one locale can be selected.
-
-Note: Anytime you log in to the installed system, you can change either the locale for that particular session or the default locale. In the login screen, select the Options button and then choose Select language.
--- a/usr/src/cmd/gui-install/data/INSTALL_PROGRESS_PANEL.txt Fri May 21 08:53:04 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-Installing
-
-
-A progress bar displays during the installation of the OpenSolaris OS.
-
-
-CAUTION: Do not interrupt an installation in progress.
--- a/usr/src/cmd/gui-install/data/INSTALL_REVIEW_PANEL.txt Fri May 21 08:53:04 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-Installation
-
-
-This panel enables you to review and confirm installation specifications.
-
-
-Procedure
-
-1. Review your installation selections.
-
-2. Optional: Use the back button to make changes.
-
-3. Click Install. A progress bar displays during the installation.
-
- CAUTION: The installation begins when you click Install. Do not interrupt an installation in progress.
-
--- a/usr/src/cmd/gui-install/data/INSTALL_TIMEZONE_PANEL.txt Fri May 21 08:53:04 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-Time Zone, Date and Time
-
-
-This panel enables you to enter the correct time zone, date, and time for the system to be installed. Select a time zone or location where the computer is typically used.
-
-The top half of the panel displays a world map with major cities marked. The bottom half of the panel provides dropdown selections. You can choose the time zone either from the map or from the dropdown list. If you select a time zone from the map, your selection automatically is entered in the dropdown list.
-
-Procedure
-
-OPTION 1: Select the time zone from the map. You can either click on a city or click anywhere on the map.
-
- If you click on the map, but not on a city, the map automatically magnifies that area. You can click on a location within that magnified area. You can drag the cursor to move the magnified area to a different location on the map. You can right-click to deselect magnification.
-
- When you select a site on the map, the dropdown selections are automatically updated with the time zone, date, and current time for that map selection.
-
-OPTION 2: Instead of using the map, you can make your selections in the dropdown fields.
-
- 1. Select your region, then select Location. Finally, select time zone. The options for each dropdown are determined by the selection made in the prior dropdown.
-
- 2. Optional: You can edit the default date and time that is provided.
-
-
--- a/usr/src/cmd/gui-install/data/INSTALL_USERS_PANEL.txt Fri May 21 08:53:04 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-Users
-
-
-In this panel, you will define a user account and enter a computer name.
-
-
-For the user account fields:
-
- * A user account is required.
-
- * To complete the user account, the Log-in name and password are required.
-
- * The Log-in name must begin with a letter and can contain only letters and numbers.
-
-For the computer name field:
-
- * Enter a computer name or accept the default. The computer name field cannot be blank.
-
-If invalid information is provided, error messages are displayed.
-
--- a/usr/src/cmd/gui-install/data/UPGRADE_DISK_PANEL.txt Fri May 21 08:53:04 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-Disk
-
-This panel displays the internal disks, external disks, and solid-state drives that are available on the system. This panel also displays the size of each disk in gigabytes. This panel enables you to choose a disk for the upgrade.
-
-Note: In order to be recognized by the installer, the disks and solid-state drives must be turned on at the time the computer boots.
-
-Definition
-
- An upgrade of the Solaris OS merges the new version of the Solaris OS with the existing files on the system's disk or disks. An upgrade saves as many modifications as possible that you have made to the previous version of the Solaris OS.
-
-
-Guidelines
-
- * For details about a disk, move the cursor over the disk icon. A popup box provides disk specifications.
-
- * Solaris OS releases that are too old for upgrade are noted as such and cannot be selected.
-
- * Developer tools are not upgraded. You can manually upgrade these tools after the installation.
--- a/usr/src/cmd/gui-install/data/UPGRADE_FAILURE_PANEL.txt Fri May 21 08:53:04 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-Upgrade Failed
-
-
-This panel displays if the Solaris OS upgrade failed.
-
-
-Procedures
-
-Choose from the following alternatives:
-
- * Select View Log to view the installation log in a separate window.
-
-
- * Select Close to exit this panel. A terminal window opens to provide command-line access. You can use the command line to explore the cause of failure, reboot, or restart the installer.
-
- Options include:
-
- * Reboot the system:
-
- % reboot
-
- * Restart the installer:
-
- % install-solaris
-
- * View installation logs at the following locations:
-
- /a/var/sadm/system/logs/install_log
- /a/var/sadm/system/logs/upgrade_log
- /a/var/sadm/system/logs/sysidtool.log
-
-
--- a/usr/src/cmd/gui-install/data/UPGRADE_PROGRESS_PANEL.txt Fri May 21 08:53:04 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-Upgrading
-
-A progress bar displays during the installation of the Solaris OS.
-
-
-Guidelines
-
- * Solaris information messages display during the installation. The message changes once per minute.
-
- * Use the arrow keys to move forward and backward through the messages.
-
- WARNING: Terminating the upgrade leaves the disk in an indeterminate state.
--- a/usr/src/cmd/gui-install/data/UPGRADE_REVIEW_PANEL.txt Fri May 21 08:53:04 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-Upgrade
-
-This panel enables you to review and confirm upgrade specifications and the license agreement.
-
-
-Procedure
-
-1. Review your upgrade selections.
-
-2. (Optional) Use the back button to make changes.
-
-3. Review and accept the license agreement.
-
-4. Click Upgrade.
-
- WARNING: The upgrade begins when you click Upgrade. You cannot stop the upgrade after this point.
-
- Note: If you do not accept the license and you select Upgrade, a dialog box asks for license acceptance.
-
- * If you click Cancel in this dialog box, the installer returns to the Review panel.
-
- * If you click Accept in this dialog box, the installation begins.
--- a/usr/src/cmd/gui-install/data/WELCOME_PANEL.txt Fri May 21 08:53:04 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-Welcome to the OpenSolaris Installer
-
-
-This screen enables you to initiate an interactive installation of the OpenSolaris Operating System (OS).
-
-CAUTION: This installation overwrites the whole disk if one of the following is true.
- a) You are installing to the whole disk.
- b) The disk was not previously partitioned.
-However, if you choose to install to a Solaris partition on the disk, the installation can be set to overwrite only that partition. Other existing partitions need not be changed.
-
-To view the online help for any screen in this installer, select the Help, "?", button on that installer panel. For complete installation instructions, select the Getting Started With OpenSolaris icon on the Live CD desktop and refer to the section in that Getting Started document that covers installing to your system. This Getting Started document also includes a link to the current Release Notes.
-
-CAUTION: This installation does not upgrade an existing OpenSolaris OS. Instead, this installation of the OpenSolaris OS overwrites an existing Solaris or OpenSolaris OS with the new version of the OpenSolaris OS. If you want to upgrade an existing OpenSolaris OS, use the pkg(1) command or the Package Manager application instead of this installer. For upgrade instructions, select the Getting Started With OpenSolaris icon on the Live CD desktop, and refer to the section in that Getting Started document that covers upgrading your system.
-
-Note: You can choose to end the installation on any panel by selecting the Quit button.
-
-
--- a/usr/src/cmd/gui-install/data/solaris-gui-install.schemas Fri May 21 08:53:04 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-<!--
- Copyright 2008 Sun Microsystems, Inc. All rights reserved.
- Use is subject to license terms.
-
-
- 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 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
--->
-<gconfschemafile>
- <schemalist>
- <schema>
- <key>/schemas/apps/solaris-gui-install/windowwidth</key>
- <applyto>/apps/solaris-gui-install/windowwidth</applyto>
- <owner>gui-install</owner>
- <type>int</type>
- <default>890</default>
- <locale name="C">
- <short>The default window width</short>
- <long>The default width in pixels of the new Solaris installer GUI.</long>
- <default>890</default>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/solaris-gui-install/windowheight</key>
- <applyto>/apps/solaris-gui-install/windowheight</applyto>
- <owner>gui-install</owner>
- <type>int</type>
- <default>690</default>
- <locale name="C">
- <short>The default window height.</short>
- <long>The default width in pixels of the new Solaris installer GUI.</long>
- <default>690</default>
- </locale>
- </schema>
- </schemalist>
-</gconfschemafile>
Binary file usr/src/cmd/gui-install/pixmaps/install-01.png has changed
Binary file usr/src/cmd/gui-install/pixmaps/install-02.png has changed
Binary file usr/src/cmd/gui-install/pixmaps/install-03.png has changed
Binary file usr/src/cmd/gui-install/pixmaps/install-04.png has changed
Binary file usr/src/cmd/gui-install/pixmaps/install-05.png has changed
--- a/usr/src/cmd/slim-install/user/jack/Makefile Fri May 21 08:53:04 2010 -0600
+++ b/usr/src/cmd/slim-install/user/jack/Makefile Mon May 24 17:31:06 2010 -0400
@@ -23,35 +23,37 @@
#
JACKCONFIGAUTOFILESRC = iotrace.desktop ddu_silent.desktop
-JACKFILESRC644 = xscreensaver xorg.conf.vesa
-JACKFILESRC755 = Xclients local.bashrc local.profile
+JACKFILESRC644 = xorg.conf.vesa
JACKDESKTOPFILESRC = install_opensolaris.desktop ddu.desktop \
getting_started.desktop .os-icons-installed gparted.desktop
-
+JACKDOTFILESRC = Xclients bashrc profile xscreensaver
include $(SRC)/cmd/slim-install/Makefile.slim
JACKFILES644= $(JACKFILESRC644:%=$(ROOTJACK)/%)
$(JACKFILES644) := FILEMODE= 0644
-JACKFILES755= $(JACKFILESRC755:%=$(ROOTJACK)/%)
-$(JACKFILES755) := FILEMODE= 0755
-
JACKCONFIGAUTOFILES= $(JACKCONFIGAUTOFILESRC:%=$(ROOTJACKCONFIGAUTO)/%)
$(JACKCONFIGAUTOFILES) := FILEMODE= 0644
JACKDESKTOPFILES= $(JACKDESKTOPFILESRC:%=$(ROOTJACKDESKTOP)/%)
$(JACKDESKTOPFILES) := FILEMODE= 0644
+JACKDOTFILES= $(JACKDOTFILESRC:%=$(ROOTJACK)/.%)
+$(JACKDOTFILES) := FILEMODE= 0755
+
all:
install: all $(ROOTJACK) $(ROOTJACKCONFIGAUTO) $(ROOTJACKDESKTOP) \
- $(JACKFILES644) $(JACKFILES755) $(JACKCONFIGAUTOFILES) \
+ $(JACKFILES644) $(JACKDOTFILES) $(JACKCONFIGAUTOFILES) \
$(JACKDESKTOPFILES)
$(ROOTJACK) $(ROOTJACKCONFIGAUTO) $(ROOTJACKDESKTOP):
$(INS.dir)
+$(ROOTJACK)/.%: % $(ROOTJACK)
+ $(INS.rename)
+
$(ROOTJACK)/%: % $(ROOTJACK)
$(INS.file)
@@ -62,6 +64,6 @@
$(INS.file)
clobber clean:
-
+
.os-icons-installed:
$(TOUCH) $@
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/slim-install/user/jack/bashrc Mon May 24 17:31:06 2010 -0400
@@ -0,0 +1,7 @@
+#
+# Define default prompt to <username>@<hostname>:<path><"($|#) ">
+# and print '#' for user "root" and '$' for normal users.
+#
+PS1='${LOGNAME}@$(/usr/bin/hostname):$(
+ [[ "${LOGNAME}" == "root" ]] && printf "%s" "${PWD/${HOME}/~}# " ||
+ printf "%s" "${PWD/${HOME}/~}\$ ")'
--- a/usr/src/cmd/slim-install/user/jack/local.bashrc Fri May 21 08:53:04 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#
-# Define default prompt to <username>@<hostname>:<path><"($|#) ">
-# and print '#' for user "root" and '$' for normal users.
-#
-PS1='${LOGNAME}@$(/usr/bin/hostname):$(
- [[ "${LOGNAME}" == "root" ]] && printf "%s" "${PWD/${HOME}/~}# " ||
- printf "%s" "${PWD/${HOME}/~}\$ ")'
--- a/usr/src/cmd/slim-install/user/jack/local.profile Fri May 21 08:53:04 2010 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-#
-# Simple profile places /usr/gnu/bin at front,
-# adds /usr/X11/bin, /usr/sbin and /sbin to the end.
-#
-# Use less(1) as the default pager for the man(1) command.
-#
-export PATH=/usr/gnu/bin:/usr/bin:/usr/X11/bin:/usr/sbin:/sbin
-export MANPATH=/usr/gnu/share/man:/usr/share/man:/usr/X11/share/man
-export PAGER="/usr/bin/less -ins"
-
-#
-# Define default prompt to <username>@<hostname>:<path><"($|#) ">
-# and print '#' for user "root" and '$' for normal users.
-#
-PS1='${LOGNAME}@$(/usr/bin/hostname):$(
- [[ "${LOGNAME}" == "root" ]] && printf "%s" "${PWD/${HOME}/~}# " ||
- printf "%s" "${PWD/${HOME}/~}\$ ")'
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/slim-install/user/jack/profile Mon May 24 17:31:06 2010 -0400
@@ -0,0 +1,17 @@
+#
+# Simple profile places /usr/gnu/bin at front,
+# adds /usr/X11/bin, /usr/sbin and /sbin to the end.
+#
+# Use less(1) as the default pager for the man(1) command.
+#
+export PATH=/usr/gnu/bin:/usr/bin:/usr/X11/bin:/usr/sbin:/sbin
+export MANPATH=/usr/gnu/share/man:/usr/share/man:/usr/X11/share/man
+export PAGER="/usr/bin/less -ins"
+
+#
+# Define default prompt to <username>@<hostname>:<path><"($|#) ">
+# and print '#' for user "root" and '$' for normal users.
+#
+PS1='${LOGNAME}@$(/usr/bin/hostname):$(
+ [[ "${LOGNAME}" == "root" ]] && printf "%s" "${PWD/${HOME}/~}# " ||
+ printf "%s" "${PWD/${HOME}/~}\$ ")'
--- a/usr/src/cmd/text-install/helpfiles/Makefile Fri May 21 08:53:04 2010 -0600
+++ b/usr/src/cmd/text-install/helpfiles/Makefile Mon May 24 17:31:06 2010 -0400
@@ -20,8 +20,7 @@
#
#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
include ../../Makefile.cmd
@@ -46,12 +45,12 @@
x86_fdisk_slices_select.txt \
x86_fdisk_slices.txt
-ROOTHELP_FILES= $(HELP_FILES:%=$(ROOTUSRSHARETI)/%)
+ROOTHELP_FILES= $(HELP_FILES:%=$(ROOTUSRSHARETIHELPC)/%)
$(ROOTUSRSHARETI):
$(INS.dir)
-all: $(ROOTUSRSHARETI)
+all: $(ROOTUSRSHARETIHELPC)
clean:
rm -rf $(ROOTUSRSHARETI)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkg/Makefile Mon May 24 17:31:06 2010 -0400
@@ -0,0 +1,725 @@
+#
+# 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) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+include $(SRC)/Makefile.master
+include $(SRC)/Makefile.buildnum
+
+#
+# Make sure we're getting a consistent execution environment for the
+# embedded scripts.
+#
+SHELL= /usr/bin/ksh93
+
+#
+# To suppress package dependency generation on any system, regardless
+# of how it was installed, set SUPPRESSPKGDEP=true in the build
+# environment.
+#
+SUPPRESSPKGDEP= false
+
+#
+# Comment this line out or set "PKGDEBUG=" in your build environment
+# to get more verbose output from the make processes in usr/src/pkg
+#
+PKGDEBUG= @
+
+#
+# Cross platform packaging notes
+#
+# By default, we package the proto area from the same architecture as
+# the packaging build. In other words, if you're running nightly or
+# bldenv on an x86 platform, it will take objects from the x86 proto
+# area and use them to create x86 repositories.
+#
+# If you want to create repositories for an architecture that's
+# different from $(uname -p), you do so by setting PKGMACH in your
+# build environment.
+#
+# For this to work correctly, the following must all happen:
+#
+# 1. You need the desired proto area, which you can get either by
+# doing a gatekeeper-style build with the -U option to
+# nightly(1), or by using rsync. If you don't do this, you will
+# get packaging failures building all packages, because pkgsend
+# is unable to find the required binaries.
+# 2. You need the desired tools proto area, which you can get in the
+# same ways as the normal proto area. If you don't do this, you
+# will get packaging failures building SUNWonbld, because pkgsend is
+# unable to find the tools binaries.
+# 3. You need to have built the appropriate third party license
+# files in $SRC, which generally means you should override SRC in
+# your build environment. If you don't do this, you will get
+# packaging failures because pkgsend is unable to find various
+# THIRDPARTYLICENSE files.
+# 4. The remainder of this Makefile should never refer directly to
+# $(MACH). Instead, $(PKGMACH) should be used whenever an
+# architecture-specific path or token is needed. If this is done
+# incorrectly, then packaging will fail, and you will see the
+# value of $(uname -p) instead of the value of $(PKGMACH) in the
+# commands that fail.
+# 5. Each time a rule in this Makefile invokes $(MAKE), it should
+# pass PKGMACH=$(PKGMACH) explicitly on the command line. If
+# this is done incorrectly, then packaging will fail, and you
+# will see the value of $(uname -p) instead of the value of
+# $(PKGMACH) in the commands that fail.
+#
+# Refer also to the convenience targets defined later in this
+# Makefile.
+#
+PKGMACH= $(MACH)
+
+#
+# ROOT, TOOLS_PROTO, and PKGARCHIVE should be set by nightly or
+# bldenv. These macros translate them into terms of $PKGMACH, instead
+# of $ARCH.
+#
+PKGROOT.cmd= print $(ROOT) | sed -e s:/root_$(MACH):/root_$(PKGMACH):
+PKGROOT= $(PKGROOT.cmd:sh)
+TOOLSROOT.cmd= print $(TOOLS_PROTO) | sed -e s:/root_$(MACH):/root_$(PKGMACH):
+TOOLSROOT= $(TOOLSROOT.cmd:sh)
+PKGDEST.cmd= print $(PKGARCHIVE) | sed -e s:/$(MACH)/:/$(PKGMACH)/:
+PKGDEST= $(PKGDEST.cmd:sh)
+
+#
+# The publish transforms, EXCEPTIONS list, and some manifests need to
+# know when we're building open-only and when we're using internal
+# crypto bits.
+#
+# We only use internal crypto when we're doing a closed build, the
+# CODESIGN_USER env variable is not set, and ON_CRYPTO_BINS is not set.
+# This matches the conditions under which the internal key and cert
+# are needed for the packaged objects.
+#
+# We use X_FLAG, as exported by nightly and bldenv, to decide when we
+# need IHV-related exceptions for protocmp.
+#
+$(CLOSED_BUILD)OPEN_ONLY_BUILD= $(POUND_SIGN)
+
+USE_INTERNAL_CRYPTO= $(POUND_SIGN)
+UI1= $(CODESIGN_USER:%=$(POUND_SIGN))
+$(UI1)UI2= $(ON_CRYPTO_BINS:%=$(POUND_SIGN))
+$(CLOSED_BUILD)USE_INTERNAL_CRYPTO= $(UI1)$(UI2)
+USE_SIGNED_CRYPTO=
+$(USE_INTERNAL_CRYPTO)USE_SIGNED_CRYPTO= $(POUND_SIGN)
+
+X_FLAG= n
+IHV_COPY_BUILD1= $(X_FLAG:n%=$(POUND_SIGN)%)
+IHV_COPY_BUILD= $(IHV_COPY_BUILD1:y%=%)
+
+
+EXCEPTIONS= packaging
+$(CLOSED_BUILD)EXCEPTIONS += packaging.closed
+$(OPEN_ONLY_BUILD)EXCEPTIONS += packaging.open
+$(IHV_COPY_BUILD)EXCEPTIONS += packaging.ihv
+
+PKGMOGRIFY= pkgmogrify
+
+#
+# Always build the redistributable repository, but only build the
+# nonredistributable bits if we have access to closed source.
+#
+# Some objects that result from the closed build are still
+# redistributable, and should be packaged as part of an open-only
+# build. Access to those objects is provided via the closed-bins
+# tarball. See usr/src/tools/scripts/bindrop.sh for details.
+#
+REPOS= redist
+$(CLOSED_BUILD)REPOS += extra
+
+#
+# The packages directory will contain the processed manifests as
+# direct build targets and subdirectories for package metadata extracted
+# incidentally during manifest processing.
+#
+# Nothing underneath $(PDIR) should ever be managed by SCM.
+#
+PDIR= packages.$(PKGMACH)
+
+PKGPUBLISHER= $(PKGPUBLISHER_REDIST)
+$(PKGDEST)/repo.extra:= PKGPUBLISHER= $(PKGPUBLISHER_NONREDIST)
+
+#
+# To get these defaults, manifests should simply refer to $(PKGVERS).
+#
+PKGVERS_COMPONENT= 0.$(RELEASE)
+PKGVERS_BUILTON= $(RELEASE)
+PKGVERS_BRANCH= 0.$(INSTALL_BUILDNUM)
+PKGVERS= $(PKGVERS_COMPONENT),$(PKGVERS_BUILTON)-$(PKGVERS_BRANCH)
+
+#
+# The ARCH32 and ARCH64 macros are used in the manifests to express
+# architecture-specific subdirectories in the installation paths
+# for isaexec'd commands.
+#
+# We can't simply use $(MACH32) and $(MACH64) here, because they're
+# only defined for the build architecture. To do cross-platform
+# packaging, we need both values.
+#
+i386_ARCH32= i86
+sparc_ARCH32= sparcv7
+i386_ARCH64= amd64
+sparc_ARCH64= sparcv9
+
+#
+# macros and transforms needed by pkgmogrify
+#
+# If you append to this list using target-specific assignments (:=),
+# be very careful that the targets are of the form $(PDIR)/pkgname. If
+# you use a higher level target, or a package list, you'll trigger a
+# complete reprocessing of all manifests because they'll fail command
+# dependency checking.
+#
+PM_TRANSFORMS= publish restart_fmri defaults extract_metadata
+PM_INC= transforms
+
+PKGMOG_DEFINES= \
+ i386_ONLY=$(POUND_SIGN) \
+ sparc_ONLY=$(POUND_SIGN) \
+ $(PKGMACH)_ONLY= \
+ ARCH=$(PKGMACH) \
+ ARCH32=$($(PKGMACH)_ARCH32) \
+ ARCH64=$($(PKGMACH)_ARCH64) \
+ PKGVERS_COMPONENT=$(PKGVERS_COMPONENT) \
+ PKGVERS_BUILTON=$(PKGVERS_BUILTON) \
+ PKGVERS_BRANCH=$(PKGVERS_BRANCH) \
+ PKGVERS=$(PKGVERS) \
+ SRC=$(SRC) \
+ CLOSED_BUILD=$(CLOSED_BUILD) \
+ OPEN_BUILD=$(OPEN_ONLY_BUILD) \
+ USE_INTERNAL_CRYPTO=$(USE_INTERNAL_CRYPTO) \
+ USE_SIGNED_CRYPTO=$(USE_SIGNED_CRYPTO)
+
+PKGDEP_TOKENS_i386= \
+ 'PLATFORM=i86hvm' \
+ 'PLATFORM=i86pc' \
+ 'PLATFORM=i86xpv' \
+ 'ISALIST=amd64' \
+ 'ISALIST=i386'
+PKGDEP_TOKENS_sparc= \
+ 'PLATFORM=sun4u' \
+ 'PLATFORM=sun4v' \
+ 'ISALIST=sparcv9' \
+ 'ISALIST=sparc'
+PKGDEP_TOKENS= $(PKGDEP_TOKENS_$(PKGMACH))
+
+#
+# The package lists are generated with $(PKGDEP_TYPE) as their
+# dependency types, so that they can be included by either an
+# incorporation or a group package.
+#
+$(PDIR)/install-redist.mog $(PDIR)/install-extra.mog:= PKGDEP_TYPE= require
+$(PDIR)/install-incorporation.mog:= PKGDEP_TYPE= incorporate
+
+PKGDEP_INCORP= \
+ depend fmri=consolidation/install/install-incorporation type=require
+
+#
+# All packaging build products should go into $(PDIR), so they don't
+# need to be included separately in CLOBBERFILES.
+#
+CLOBBERFILES= $(PDIR) proto_list_$(PKGMACH)
+
+#
+# By default, PKGS will list all manifests. To build and/or publish a
+# subset of packages, override this on the command line or in the
+# build environment and then reference (implicitly or explicitly) the all
+# or install targets.
+#
+MANIFESTS :sh= (cd manifests; print *.mf)
+PKGS= $(MANIFESTS:%.mf=%)
+DEP_PKGS= $(PKGS:%=$(PDIR)/%.dep)
+PROC_PKGS= $(PKGS:%=$(PDIR)/%.mog)
+
+#
+# Track the synthetic manifests separately so we can properly express
+# build rules and dependencies. The synthetic and real packages use
+# different sets of transforms and macros for pkgmogrify.
+#
+SYNTH_PKGS= install-incorporation install-redist
+$(CLOSED_BUILD)SYNTH_PKGS += install-extra
+DEP_SYNTH_PKGS= $(SYNTH_PKGS:%=$(PDIR)/%.dep)
+PROC_SYNTH_PKGS= $(SYNTH_PKGS:%=$(PDIR)/%.mog)
+
+#
+# For each package, we determine the target repository based on
+# manifest-embedded metadata. Because we make that determination on
+# the fly, the publication target cannot be expressed as a
+# subdirectory inside the unknown-by-the-makefile target repository.
+#
+# In order to limit the target set to real files in known locations,
+# we use a ".pub" file in $(PDIR) for each processed manifest, regardless
+# of content or target repository.
+#
+PUB_PKGS= $(SYNTH_PKGS:%=$(PDIR)/%.pub) $(PKGS:%=$(PDIR)/%.pub)
+
+#
+# Any given repository- and status-specific package list may be empty,
+# but we can only determine that dynamically, so we always generate all
+# lists for each repository we're building.
+#
+# The meanings of each package status are as follows:
+#
+# PKGSTAT meaning
+# ---------- ----------------------------------------------------
+# noincorp Do not include in incorporation or group package
+# obsolete Include in incorporation, but not group package
+# renamed Include in incorporation, but not group package
+# current Include in incorporation and group package
+#
+# Since the semantics of the "noincorp" package status dictate that
+# such packages are not included in the incorporation or group packages,
+# there is no need to build noincorp package lists.
+#
+# Since packages depend on their incorporation, noincorp necessarily
+# implies nodepend, or it would inadvertently pull in other packages.
+#
+PKGLISTS= \
+ $(REPOS:%=$(PDIR)/packages.%.current)
+# XXX We don't have any of the two below right now
+# $(REPOS:%=$(PDIR)/packages.%.renamed) \
+# $(REPOS:%=$(PDIR)/packages.%.obsolete)
+
+.KEEP_STATE:
+
+.PARALLEL: $(PKGS) $(PROC_PKGS) $(DEP_PKGS) \
+ $(PROC_SYNTH_PKGS) $(DEP_SYNTH_PKGS) $(PUB_PKGS)
+
+#
+# For a single manifest, the dependency chain looks like this:
+#
+# raw manifest (mypkg.mf)
+# |
+# | use pkgmogrify to process raw manifest
+# |
+# processed manifest (mypkg.mog)
+# |
+# * | use pkgdepend generate to generate dependencies
+# |
+# manifest with TBD dependencies (mypkg.dep)
+# |
+# % | use pkgdepend resolve to resolve dependencies
+# |
+# manifest with dependencies resolved (mypkg.res)
+# |
+# | use pkgsend to publish the package
+# |
+# placeholder to indicate successful publication (mypkg.pub)
+#
+# * This may be suppressed via SUPPRESSPKGDEP. The resulting
+# packages will install correctly, but care must be taken to
+# install all dependencies, because pkg will not have the input
+# it needs to determine this automatically.
+#
+# % This is included in this diagram to make the picture complete, but
+# this is a point of synchronization in the build process.
+# Dependency resolution is actually done once on the entire set of
+# manifests, not on a per-package basis.
+#
+# The full dependency chain for generating everything that needs to be
+# published, without actually publishing it, looks like this:
+#
+# processed synthetic packages
+# | |
+# package lists synthetic package manifests
+# |
+# processed real packages
+# | |
+# package dir real package manifests
+#
+# Here, each item is a set of real or synthetic packages. For this
+# portion of the build, no reference is made to the proto area. It is
+# therefore suitable for the "all" target, as opposed to "install."
+#
+# Since each of these steps is expressed explicitly, "all" need only
+# depend on the head of the chain.
+#
+# From the end of manifest processing, the publication dependency
+# chain looks like this:
+#
+# repository metadata (catalogs and search indices)
+# |
+# | pkg.depotd
+# |
+# published packages
+# | |
+# | | pkgsend publish
+# | |
+# repositories resolved dependencies
+# | |
+# pkgsend | | pkgdepend resolve
+# create-repository |
+# | generated dependencies
+# repo directories |
+# | pkgdepend
+# |
+# processed manifests
+#
+# Due to limitations in pkgdepend, we cannot simply treat synthetic
+# and real manifests identically. But we don't really want to
+# maintain a separate chain for synthetic manifests, so for the left
+# side of this diagram, we actually do faux dependency generation and
+# resolution, so we end up with the expected set of files in $(PDIR),
+# per the individual file chain described above: mf, mog, dep, res,
+# and pub files for each manifest.
+#
+all: $(PROC_SYNTH_PKGS) proto_list_$(PKGMACH)
+
+#
+# This will build the directory to contain the processed manifests
+# and the metadata symlinks.
+#
+$(PDIR):
+ @print "Creating $(@)"
+ $(PKGDEBUG)$(INS.dir)
+
+#
+# This rule resolves dependencies across all published manifests.
+# We should be able to do this with
+#
+# pkgdepend resolve -m $(PUB_PKGS:%.pub=%.dep)
+#
+# but until 14113 is fixed, the incorporations confuse pkgdepend, so we
+# just create the .res file for DEP_SYNTH_PKGS directly.
+#
+# We also shouldn't have to ignore the error from pkgdepend, but
+# until at least 14110 is resolved, pkgdepend will always exit with
+# an error.
+#
+$(PDIR)/gendeps: $(DEP_SYNTH_PKGS) $(DEP_PKGS)
+ -$(PKGDEBUG)if [ "$(SUPPRESSPKGDEP)" = "true" ]; then \
+ print "Suppressing dependency resolution"; \
+ for p in $(DEP_PKGS:%.dep=%); do \
+ $(CP) $$p.dep $$p.res; \
+ done; \
+ else \
+ print "Resolving dependencies"; \
+ pkgdepend resolve -m $(DEP_PKGS); \
+ for p in $(DEP_PKGS:%.dep=%); do \
+ $(MV) $$p.dep.res $$p.res; \
+ done; \
+ fi
+ $(PKGDEBUG)for p in $(DEP_SYNTH_PKGS:%.dep=%); \
+ do \
+ $(CP) $$p.dep $$p.res; \
+ done
+ $(PKGDEBUG)$(TOUCH) $(@)
+
+install: repository-metadata
+
+repository-metadata: publish_pkgs
+ @print "Creating repository metadata"
+ $(PKGDEBUG)for r in $(REPOS); do \
+ /usr/lib/pkg.depotd -d $(PKGDEST)/repo.$$r \
+ --add-content --exit-ready; \
+ done
+
+#
+# Since we create zero-length processed manifests for a graceful abort
+# from pkgmogrify, we need to detect that here and make no effort to
+# publish the package.
+#
+# For all other packages, we publish them regardless of status. We
+# derive the target repository as a component of the metadata-derived
+# symlink for each package.
+#
+publish_pkgs: $(REPOS:%=$(PKGDEST)/repo.%) $(PDIR)/gendeps .WAIT $(PUB_PKGS)
+
+$(PUB_PKGS): FRC
+
+#
+# Initialize the empty on-disk repositories
+#
+$(REPOS:%=$(PKGDEST)/repo.%):
+ @print "Initializing $(@F)"
+ $(PKGDEBUG)$(INS.dir)
+ $(PKGDEBUG)pkgsend -s file://$(@) create-repository \
+ --set-property publisher.prefix=$(PKGPUBLISHER)
+
+#
+# rule to process real manifests
+#
+# To allow redistributability and package status to change, we must
+# remove not only the actual build target (the processed manifest), but
+# also the incidental ones (the metadata-derived symlinks).
+#
+# If pkgmogrify exits cleanly but fails to create the specified output
+# file, it means that it encountered an abort directive. That means
+# that this package should not be published for this particular build
+# environment. Since we can't prune such packages from $(PKGS)
+# retroactively, we need to create an empty target file to keep make
+# from trying to rebuild it every time. For these empty targets, we
+# do not create metadata symlinks.
+#
+# Automatic dependency resolution to files is also done at this phase of
+# processing. The skipped packages are skipped due to existing bugs
+# in pkgdepend.
+#
+# The incorporation dependency is tricky: it needs to go into all
+# current and renamed manifests (ie all incorporated packages), but we
+# don't know which those are until after we run pkgmogrify. So
+# instead of expressing it as a transform, we tack it on ex post facto.
+#
+# Implementation notes:
+#
+# - The first $(RM) must not match other manifests, or we'll run into
+# race conditions with parallel manifest processing.
+#
+# - The make macros [ie $(MACRO)] are evaluated when the makefile is
+# read in, and will result in a fixed, macro-expanded rule for each
+# target enumerated in $(PROC_PKGS).
+#
+# - The shell variables (ie $$VAR) are assigned on the fly, as the rule
+# is executed. The results may only be referenced in the shell in
+# which they are assigned, so from the perspective of make, all code
+# that needs these variables needs to be part of the same line of
+# code. Hence the use of command separators and line continuation
+# characters.
+#
+# - The extract_metadata transforms are designed to spit out shell
+# variable assignments to stdout. So the eval statement should
+# begin with the default values, and any output from pkgmogrify
+# should be in the form of a variable assignment to override those
+# defaults.
+#
+# - When this rule completes execution, it must leave an updated
+# target file ($@) in place, or make will reprocess the package
+# every time it encounters it as a dependency. Hence the "touch"
+# statement to ensure that the target is created, even when
+# pkgmogrify encounters an abort in the publish transforms. This
+# will not cause publication failures when switching build
+# environments, because $(CLOSED_BUILD) and $(OPEN_ONLY) are
+# referenced in $(PKGMOG_DEFINES), and changes will therefore
+# trigger a rebuild for command dependency failure. (Command
+# dependency checking is turned on by .KEEP_STATE: above.)
+#
+
+.SUFFIXES: .mf .mog .dep .res .pub
+
+$(PDIR)/%.mog: manifests/%.mf
+ @print "Processing manifest $(<F)"
+ $(PKGDEBUG)$(RM) $(@) $(@:%.mog=%) $(@:%.mog=%.nodepend) \
+ $(PDIR)/$(@F:%.mog=%).metadata.*
+ $(PKGDEBUG)eval REPO=redist PKGSTAT=current \
+ NODEPEND=$(SUPPRESSPKGDEP) \
+ `$(PKGMOGRIFY) $(PKGMOG_VERBOSE) $(PM_INC:%= -I %) \
+ $(PKGMOG_DEFINES:%=-D %) -O $(@) $(<) $(PM_TRANSFORMS)`; \
+ if [ -f $(@) ]; then \
+ if [ \( "$$NODEPEND" != "false" \) -o \
+ \( "$$PKGSTAT" = "noincorp" \) ]; then \
+ $(TOUCH) $(@:%.mog=%.nodepend); \
+ fi; \
+ $(LN) -s $(@F) \
+ $(PDIR)/$(@F:%.mog=%).metadata.$$PKGSTAT.$$REPO; \
+ if [ \( "$$PKGSTAT" = "current" \) -o \
+ \( "$$PKGSTAT" = "renamed" \) ]; \
+ then print $(PKGDEP_INCORP) >> $(@); \
+ fi; \
+ else \
+ $(TOUCH) $(@); \
+ fi
+
+$(PDIR)/%.dep: $(PDIR)/%.mog
+ @print "Generating dependencies for $(<F)"
+ $(PKGDEBUG)$(RM) $(@)
+ $(PKGDEBUG)if [ ! -f $(@:%.dep=%.nodepend) ]; then \
+ pkgdepend generate -m $(PKGDEP_TOKENS:%=-D %) $(<) \
+ $(PKGROOT) > $(@); \
+ else \
+ $(CP) $(<) $(@); \
+ fi
+
+#
+# The full chain implies that there should be a .dep.res suffix rule,
+# but dependency generation is done on a set of manifests, rather than
+# on a per-manifest basis. Instead, see the gendeps rule above.
+#
+
+$(PDIR)/%.pub: $(PDIR)/%.res
+ $(PKGDEBUG)m=$$(basename $(@:%.pub=%).metadata.*); \
+ r=$${m#$(@F:%.pub=%.metadata.)+(?).}; \
+ if [ -s $(<) ]; then \
+ print "Publishing $(@F:%.pub=%) to $$r repository"; \
+ pkgsend -s file://$(PKGDEST)/repo.$$r publish \
+ -d $(PKGROOT) -d $(TOOLSROOT) -d $(SRC)/pkg/license_files \
+ -d $(SRC) --fmri-in-manifest --no-index --no-catalog $(<) \
+ > /dev/null; \
+ fi; \
+ $(TOUCH) $(@);
+
+#
+# rule to build the synthetic manifests
+#
+# This rule necessarily has PKGDEP_TYPE that changes according to
+# the specific synthetic manifest. Rather than escape command
+# dependency checking for the real manifest processing, or failing to
+# express the (indirect) dependency of synthetic manifests on real
+# manifests, we simply split this rule out from the one above.
+#
+# The implementation notes from the previous rule are applicable
+# here, too.
+#
+$(PROC_SYNTH_PKGS): $(PKGLISTS) $$(@F:%.mog=%.mf)
+ @print "Processing synthetic manifest $(@F:%.mog=%.mf)"
+ $(PKGDEBUG)$(RM) $(@) $(PDIR)/$(@F:%.mog=%).metadata.*
+ $(PKGDEBUG)eval REPO=redist PKGSTAT=current \
+ `$(PKGMOGRIFY) $(PKGMOG_VERBOSE) -I transforms -I $(PDIR) \
+ $(PKGMOG_DEFINES:%=-D %) -D PKGDEP_TYPE=$(PKGDEP_TYPE) \
+ -O $(@) $(@F:%.mog=%.mf) $(PM_TRANSFORMS) synthetic` ; \
+ if [ -f $(@) ]; then \
+ $(LN) -s $(@F) \
+ $(PDIR)/$(@F:%.mog=%).metadata.$$PKGSTAT.$$REPO; \
+ else \
+ $(TOUCH) $(@); \
+ fi
+
+$(DEP_SYNTH_PKGS): $$(@:%.dep=%.mog)
+ @print "Skipping dependency generation for $(@F:%.dep=%)"
+ $(PKGDEBUG)$(CP) $(@:%.dep=%.mog) $(@)
+
+clean:
+
+clobber: clean
+ $(RM) -r $(CLOBBERFILES)
+
+#
+# This rule assumes that all links in the $PKGSTAT directories
+# point to valid manifests, and will fail the make run if one
+# does not contain an fmri.
+#
+# We do this in the BEGIN action instead of using pattern matching
+# because we expect the fmri to be at or near the first line of each input
+# file, and this way lets us avoid reading the rest of the file after we
+# find what we need.
+#
+# We keep track of a failure to locate an fmri, so we can fail the
+# make run, but we still attempt to process each package in the
+# repo/pkgstat-specific subdir, in hopes of maybe giving some
+# additional useful info.
+#
+# The protolist is used for bfu archive creation, which may be invoked
+# interactively by the user. Both protolist and PKGLISTS targets
+# depend on $(PROC_PKGS), but protolist builds them recursively.
+# To avoid collisions, we insert protolist into the dependency chain
+# here. This has two somewhat subtle benefits: it allows bfu archive
+# creation to work correctly, even when -a was not part of NIGHTLY_OPTIONS,
+# and it ensures that a protolist file here will always correspond to the
+# contents of the processed manifests, which can vary depending on build
+# environment.
+#
+$(PKGLISTS): $(PROC_PKGS)
+ $(PKGDEBUG)sdotr=$(@F:packages.%=%); \
+ r=$${sdotr%.+(?)}; s=$${sdotr#+(?).}; \
+ print "Generating $$r $$s package list"; \
+ $(RM) $(@); $(TOUCH) $(@); \
+ $(NAWK) 'BEGIN { \
+ if (ARGC < 2) { \
+ exit; \
+ } \
+ retcode = 0; \
+ for (i = 1; i < ARGC; i++) { \
+ do { \
+ e = getline f < ARGV[i]; \
+ } while ((e == 1) && (f !~ /name=pkg.fmri/)); \
+ close(ARGV[i]); \
+ if (e == 1) { \
+ l = split(f, a, "="); \
+ print "depend fmri=" a[l], \
+ "type=$$(PKGDEP_TYPE)"; \
+ } else { \
+ print "no fmri in " ARGV[i] >> "/dev/stderr"; \
+ retcode = 2; \
+ } \
+ } \
+ exit retcode; \
+ }' `find $(PDIR) -type l -a \( $(PKGS:%=-name %.metadata.$$s.$$r -o) \
+ -name NOSUCHFILE \)` >> $(@)
+
+#
+# rules to validate proto area against manifests, check for safe
+# file permission modes, and generate a faux proto list
+#
+# For the check targets, the dependencies on $(PROC_PKGS) is specified
+# as a subordinate make process in order to suppress output.
+#
+makesilent:
+ @$(MAKE) -e $(PROC_PKGS) PKGMACH=$(PKGMACH) \
+ SUPPRESSPKGDEP=$(SUPPRESSPKGDEP) > /dev/null
+
+protocmp: makesilent
+ @validate_pkg -a $(PKGMACH) -v \
+ $(EXCEPTIONS:%=-e $(CODEMGR_WS)/exception_lists/%) \
+ -m $(PDIR) -p $(PKGROOT) -p $(TOOLSROOT)
+
+pmodes: makesilent
+ @validate_pkg -a $(PKGMACH) -M -m $(PDIR) \
+ -e $(CODEMGR_WS)/exception_lists/pmodes
+
+check: protocmp pmodes
+
+protolist: proto_list_$(PKGMACH)
+
+proto_list_$(PKGMACH): $(PROC_PKGS)
+ @validate_pkg -a $(PKGMACH) -L -m $(PDIR) > $(@)
+
+$(PROC_PKGS): $(PDIR)
+
+#
+# This is a convenience target to allow package names to function as
+# build targets. Generally, using it is only useful when iterating on
+# development of a manifest.
+#
+# When processing a manifest, use the basename (without extension) of
+# the package. When publishing, use the basename with a ".pub"
+# extension.
+#
+# Other than during manifest development, the preferred usage is to
+# avoid these targets and override PKGS on the make command line and
+# use the provided all and install targets.
+#
+$(PKGS) $(SYNTH_PKGS): $(PDIR)/$$(@:%=%.mog)
+
+$(PKGS:%=%.pub) $(SYNTH_PKGS:%=%.pub): $(PDIR)/$$(@)
+
+#
+# This is a convenience target to resolve dependencies without publishing
+# packages.
+#
+gendeps: $(PDIR)/gendeps
+
+#
+# These are convenience targets for cross-platform packaging. If you
+# want to build any of "the normal" targets for a different
+# architecture, simply use "arch/target" as your build target.
+#
+# Since the most common use case for this is "install," the architecture
+# specific install targets have been further abbreviated to elide "/install."
+#
+i386/% sparc/%:
+ $(MAKE) -e $(@F) PKGMACH=$(@D) SUPPRESSPKGDEP=$(SUPPRESSPKGDEP)
+
+i386 sparc: $$(@)/install
+
+FRC:
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkg/README.pkg Mon May 24 17:31:06 2010 -0400
@@ -0,0 +1,462 @@
+#
+# 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) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+*** Special Note
+This README is a copy of the README.pkg from the ON consolidation, provided as
+a convenient local reference since our implementation in install is largely
+identical. However, some specifics of the install implementation are
+different, with names changed to reference install rather than ON. This README
+has not been edited to reflect those differences. Consult with the gatekeeper
+if you need help understanding install-specific modifications.
+*** End Special Note
+
+Introduction
+------------
+
+This README describes some basics about creating, modifying, and
+building packages in ON. All package creation in ON is done using
+tools available to our customers. If terminology in this document
+is confusing, you may wish to review the pkg(5) manpage.
+
+Packaging Overview
+------------------
+
+usr/src/pkg/ contains the definitions and rules needed to build
+a set of IPS repositories which contain the deliverables from an
+ON build.
+
+The manifests directory contains all manifests, and has one file
+per package. For most packaging changes you only need to add or
+change the packaging manifests themselves.
+
+The build rules create two repositories. These are both built
+for DEBUG and non-DEBUG, and are thus available at
+ $CODEMGR_WS/packages/$MACH/nightly[-nd]/repo.(extra|redist)
+
+ repo.redist
+ Contains the bulk of ON, and is what is delivered to the
+ main OpenSolaris 'dev' and 'release' repositories. All
+ components delivered there must be redistributable.
+
+ repo.extra
+ Is only built for Closed builds, and contains
+ non-redistributable (without a proper legal agreement) pieces
+ which may or may not be suitable for inclusion in the
+ pkg.sun.com/opensolaris/extra repository, including the
+ SUNWcryptoint bits necessary for working crypto in a Closed
+ build. Do not distribute any of the bits in repo.extra
+ without prior agreement from the appropriate lawyers.
+
+Building Packages
+-----------------
+
+The -p option to nightly will build the IPS repositories.
+
+Alternatively, in usr/src/pkg/Makefile there are make targets for:
+
+ all
+ Process manifests into their final form with unresolved
+ dependencies before publication.
+
+ install
+ Publish packages.
+
+ gendeps
+ Run `pkgdepend resolve`. See Dependencies section.
+
+ protocmp
+ Compare the proto area against package definitions for
+ missing or incorrect files.
+
+ pmodes
+ Check file and directory modes for best practices.
+
+ check
+ Run protocmp and pmodes.
+
+The build behavior may modified by the following variables:
+
+ CLOSED_IS_PRESENT
+ If CLOSED_IS_PRESENT is set to "yes," repo.extra will be built.
+
+ ON_CRYPTO_BINS or CODESIGN_USER
+ If ON_CRYPTO_BINS or CODESIGN_USER is set in your build env,
+ no packages will depend on the internal crypto certificates.
+ If neither is set, your bits depend on the internal crypto
+ certificates being available and packages will depend on
+ pkg:/driver/crypto/dprov, which is only available in the
+ on-extra repository.
+
+ SUPPRESSPKGDEP
+ If SUPPRESSPKGDEP is set to "true" in your environment,
+ package dependencies will not be generated. This variable
+ should not be set in normal builds as it will mask product
+ bugs.
+
+ PKGDEBUG
+ If PKGDEBUG is set in your environment, $MAKE will print
+ detailed information about the commands it executes to
+ process and publish packages.
+
+ ONNV_BUILDNUM
+ If ONNV_BUILDNUM is set to an older ON build number,
+ your packages will be published at that version instead
+ of the one defined in usr/src/Makefile.buildnum, which
+ is managed by the gatekeepers.
+
+A set of intermediate build products are placed in
+usr/src/pkg/packages.$MACH/. These can be useful during development.
+
+ .mog
+ The resulting package manifest after running pkgmogrify(1)
+ on the supplied manifest. See below for details on
+ pkgmogrify(1) use in ON.
+
+ .dep
+ The resulting manifest after running `pkgdepend generate`
+ on the .mog manifest.
+
+ .res
+ The resulting manifest after running `pkgdepend resolve`
+ on the .dep manifest.
+
+Incremental Builds
+------------------
+
+ If you want to process a subset of manifests, simply set PKGS on the
+ make command line and specify the "all" target. If you want to process
+ them all, simply specify the "all" target.
+
+ % dmake -e PKGS="BRCMbnx BRCMbnxe" all
+ % dmake -e all
+
+ If you want to publish a subset of packages, simply set PKGS on the
+ make command line and specify the "install" target. Overriding PKGS
+ will cause dependency resolution to be limited to PKGS from the
+ current build, with a fallback to packages installed on the build
+ system. If you want to publish them all, simply specify the
+ "install" target.
+
+ % dmake -e PKGS="BRCMbnx BRCMbnxe" install
+ % dmake -e install
+
+ You can also use package names, or package names with ".pub"
+ extensions, as build targets. This will cause processing or
+ publication of the specified package(s).
+
+ The on-disk repository will be initialized when it does not exist,
+ or when you run nightly -p. If you build incrementally,
+ packages will simply be added to the existing repository.
+
+ To do cross-platform packaging, prefix your target with (for
+ example) "sparc/", as in "dmake sparc/install". Note that we
+ currently pull some license files directly from a built source
+ tree, so if you do this in a workspace that had proto area copied
+ in via nightly -U, then you'll need to set $SRC to point to the
+ workspace that was actually built.
+
+Testing Packages
+----------------
+
+To test the generated repositories, you should use the "onu" tool
+available from /opt/onbld/bin or usr/src/tools/scripts/ to setup and
+upgrade your system. A manpage is available in /opt/onbld/man
+or usr/src/tools/scripts/onu.1.
+
+Alternatively, you can manually start a pkg.depot(1M) server to
+serve the generated repositories to multiple test machines.
+
+ Start up a depot on your build machine.
+ cd $CODEMGR_WS/packages/$MACH/nightly[-nd]
+ /usr/lib/pkg.depotd -d repo.redist -p <port> &
+
+ Make SURE you choose an unused port and the depot
+ starts successfully.
+
+ The depot can be started across NFS as well if you
+ have a fast pipe.
+
+ Configure your test system.
+ pkg set-publisher -P -g http://<your server host>:<port> on-nightly
+ pkg set-publisher --non-sticky opensolaris.org
+ pkg uninstall entire
+
+ pkg image-update your test system.
+ pkg image-update will upgrade all packages on your test system
+
+Always make sure your bits are installed with image-update.
+ Check your versions.
+ pkg info osnet-incorporation
+
+ Multiple packages should be updated.
+ If you did a full build, all ON packages will be updated.
+ When image-update tells you that only one or two packages has
+ been updated, you likely did not get the updates you expected.
+
+There are various tactics for troubleshooting a failed upgrade.
+ Make sure entire is uninstalled.
+
+ pkg install -nv osnet-incorporation@<your version>
+ Ask IPS to explicitly check if ON can be installed, and
+ if it can't, tell you why not.
+
+ Obsolete and renamed packages can cause trouble.
+ pkg search -l ::pkg.renamed:true
+ pkg search -l ::pkg.obsolete:true
+
+Making Packaging Changes
+------------------------
+
+Package definitions are in usr/src/pkg/manifests/, and have one
+file per package, including for multi-architecture packages. For
+most packaging changes you only need to add or change the packaging
+manifests themselves. No packaging metadata may be kept outside of the
+manifests. If you find yourself needing to modify usr/src/pkg/Makefile,
+you're almost certainly doing something wrong.
+
+Remember that the "check" target is available to check many of
+your packaging changes.
+
+We run pkgmogrify(1) over the manifests before publication. This
+allows us to apply a set of macros and package transformations in
+order to make the manifests themselves easier to maintain.
+
+We supply a set of commonly-used macros for use in package manifests.
+These are the PKGMOG_DEFINES in usr/src/pkg/Makefile.
+
+ $(i386_ONLY)
+ $(sparc_ONLY)
+ $(ARCH)
+ $(ARCH32)
+ $(ARCH64)
+ $(PKGVERS), which is set to
+ $(PKGVERS_COMPONENT),$(PKGVERS_BUILTON)-0.$(PKGVERS_BRANCH)
+
+pkgmogrify(1) also allows us to include a set of default transformations.
+The definitions for these transforms are in usr/src/pkg/transforms/. An
+overview of their use is supplied here, but for a full accounting, please
+read pkmogrify(1) and the files themselves.
+
+ defaults
+ This transform is applied to all manifests. It specifies
+ a set of sensible default permissions, a set of
+ directory locations for which the reboot-needed actuator
+ is always applied to files, and some other basic defaults.
+
+ publish
+ This transform is applied to all manifests. It ensures
+ that manifest lines which don't apply to the current
+ architecture are stripped. It also ensures non-redistributable
+ packages aren't included in an open-only build.
+
+ restart_fmri
+ This transform is applied to all manifests. It modifies
+ all package manifest lines for SMF manifests in standard
+ locations to include an actuator which runs manifest-import
+ on installation/update/removal, as well as some others. If
+ you're adding a new class of file that would benefit from
+ a restart or refresh of a specific SMF service, please add
+ it here.
+
+ extract_metadata
+ This transform is applied to all manifests. It deals with
+ manipulations required for packaging metadata like
+ org.opensolaris.redist, pkg.renamed, and pkg.obsolete.
+
+ hollow_zone_pkg
+ This transform is available for explicit inclusion in
+ some manifests. It ensures that all contents of the
+ package are not installed within a non-global zone, but the
+ package and its metadata are available in order to satisfy
+ packaging dependencies.
+
+pkgmogrify(1) also allows us to use comments and continuation lines
+in our manifests.
+
+Zones and Packages
+------------------
+
+pkg(5) uses variants to implement zones. If a package is marked
+with both global and non-global zone variants, the package contents will
+be installed in both global and non-global by default.
+ set name=variant.opensolaris.zone value=global value=nonglobal
+
+Specific actions within a package can be tagged as applying to only
+the global zone or only the non-global zones.
+
+The hollow_zone_pkg transform described above is also available to
+simplify a common packaging scenario.
+
+Dependencies
+------------
+
+Package dependencies are automatically calculated during build time
+using pkgdepend(1). After you've done a build, you can verify your
+dependencies in the <package>.res file described above. If the
+file is missing a dependency that you believe could be auto-detected,
+please file a bug against pkgdepend(1).
+
+Dependencies can be added manually using the "depend" action. Please
+add a comment describing why the dependency is required.
+
+Moving Content Between Packages and Removing Content
+----------------------------------------------------
+
+pkg(5) tracks when content is removed from packages, and automatically
+removes it.
+
+If you need to move content between packages, there are two primary
+things to do.
+
+ "preserve" files must be marked with original_name.
+ The first time a "preserve" file moves between packages,
+ you must set original_name=<original package>:<file>
+ in that file's action. Subsequent moves do not require
+ modification.
+
+ Consider adding a dependency on the new package.
+ The only way a system will end up with a new package
+ after upgrade is if an existing package depends on it.
+
+Renaming a Package
+------------------
+
+To rename a package, leave the old package manifest in place, but
+empty it of all delivered content. The old package should include:
+
+ set name=pkg.fmri with the version set explicitly to the
+ build you're integrating into. For example, if you wanted
+ to rename SUNWrmodu in build 133 you'd change the pkg.fmri
+ line to read
+ set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
+
+ set name=pkg.renamed value=true
+
+ The architectures and variants you're renaming. These
+ should just be copied from your old package, as you
+ must rename a package on all architectures and
+ variants simultaneously.
+
+ A dependency on the new package.
+
+If there were "preserve" files in the package you're renaming, make
+sure to create original_name settings in the new package.
+
+If there was a org.opensolaris.noincorp property in the package being
+renamed, make sure you keep it in both the original and the renamed
+packages.
+
+EOFs and Removals
+-----------------
+
+To remove files, directories, drivers, or anything else within a package,
+simply stop delivering them in the package. IPS will manage the removal
+of no longer delivered content.
+
+Package removals have impact on the rest of the system. Before marking
+a package as obsolete, search in the OpenSolaris development
+repository (http://pkg.opensolaris.org/dev or http://ipkg.sfbay/dev)
+to find out if any other packages depend on the software you intend
+to EOF. If any packages do, you need to coordinate with those
+consolidations.
+
+The "slim_install" package may depend on ON packages. If it does,
+you must send a FLAG DAY message for ON users and PIT who test
+install. You must also file an installation bug to get that package
+updated in the same build or earlier than you intend to integrate.
+You should also test install yourself. You can do this by replacing
+the "slim_install" in your Distro Constructor manifest with the
+explicit list of packages to install.
+
+To remove a package, you must mark it as obsolete. The obsoleted
+package manifest should include
+
+ set name=pkg.fmri with the version set explicitly to the
+ build you're integrating into. For example, if you wanted
+ to remove SUNWwbsd in build 133 you'd change the pkg.fmri
+ line to read
+ set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
+
+ set name=pkg.obsolete value=true
+
+ The architectures and variants you're obsoleting. These
+ should just be copied from your old package, as you
+ must obsolete a package on all architectures and
+ variants simultaneously.
+
+Creating a Package
+------------------
+
+The easiest thing is to copy a package similar to the one you're
+trying to create. Note that packages are no longer split on the
+/usr and / boundary.
+
+The following actions are required for all packages in ON.
+ set name=pkg.fmri
+ Every package must have an FMRI. That is the package's
+ name.
+
+ set name=pkg.summary
+ Every package must have a short summary of its purpose.
+
+ set name=pkg.description
+ Every package must have a one-sentence description of
+ its purpose.
+
+ set name=variant.arch
+ Every package must specify which architectures it delivers.
+
+ set name=variant.opensolaris.zone
+ Every package must specify whether it can be installed in
+ global zones, non-global zones, or both.
+
+ set name=info.classification
+ Every package must specify a category for the packaging GUI.
+ You must use an existing category, and may not invent new ones.
+ Existing categories and their subcategories are listed
+ in /usr/share/package-manager/data/opensolaris.org.sections.
+
+ license
+ All packages must specify a set of license actions. If
+ you're adding items here that are not already included in
+ usr/src/pkg/license_files, then you will also need to modify
+ usr/src/tools/opensolaris/license-list.
+
+The following actions are uncommon but specific to ON.
+
+ set name=org.opensolaris.redist
+ This may be set to nonredist or internal. If a package
+ is redistributable, do not create this action. "internal"
+ packages which are legally not allowed to be distributed
+ at all are strongly discouraged. If you're adding
+ content to a package with this action, you should have
+ modified bindrop.sh, and test open-only builds.
+
+Drivers and Packages
+--------------------
+
+Scripting is no longer required to deal with addition or removal of
+drivers in ON. A "driver" action should be specified for each driver,
+and IPS will handle updates to all the driver files.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkg/install-extra.mf Mon May 24 17:31:06 2010 -0400
@@ -0,0 +1,31 @@
+#
+# 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) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/consolidation/install/install-extra@$(PKGVERS)
+set name=variant.arch value=$(ARCH)
+set name=org.opensolaris.redist value=nonredist
+set name=pkg.description value="This group package installs all packages from the install consolidation."
+set name=pkg.summary value="install consolidation group package"
+<include packages.extra.current>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkg/install-incorporation.mf Mon May 24 17:31:06 2010 -0400
@@ -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) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/consolidation/install/install-incorporation@$(PKGVERS)
+set name=variant.arch value=$(ARCH)
+set name=pkg.description value="This incorporation constrains packages from the install consolidation."
+set name=pkg.summary value="install consolidation incorporation"
+set name=pkg.depend.install-hold value=core-os.install
+<include packages.redist.current>
+#<include packages.redist.renamed>
+#<include packages.redist.obsolete>
+$(CLOSED_BUILD)<include packages.extra.current>
+#$(CLOSED_BUILD)<include packages.extra.renamed>
+#$(CLOSED_BUILD)<include packages.extra.obsolete>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkg/install-redist.mf Mon May 24 17:31:06 2010 -0400
@@ -0,0 +1,30 @@
+#
+# 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) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/consolidation/install/install-redistributable@$(PKGVERS)
+set name=variant.arch value=$(ARCH)
+set name=pkg.description value="This group package installs all packages from the install consolidation."
+set name=pkg.summary value="install consolidation group package"
+<include packages.redist.current>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkg/license_files/cr_Sun Mon May 24 17:31:06 2010 -0400
@@ -0,0 +1,1 @@
+Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkg/license_files/lic_CDDL Mon May 24 17:31:06 2010 -0400
@@ -0,0 +1,18 @@
+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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkg/manifests/SUNWgui-install.mf Mon May 24 17:31:06 2010 -0400
@@ -0,0 +1,91 @@
+#
+# 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) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/SUNWgui-install@$(PKGVERS)
+set name=pkg.description value="Solaris Installation GUI"
+set name=pkg.summary value="Solaris Installation GUI"
+set name=info.classification value="org.opensolaris.category.2008:System Administration and Configuration"
+set name=variant.arch value=$(ARCH)
+set name=variant.opensolaris.zone value=global
+dir path=etc group=sys
+dir path=etc/gconf group=sys
+dir path=etc/gconf/schemas group=sys
+dir path=etc/security group=sys
+dir path=etc/security/exec_attr.d group=sys
+dir path=usr group=sys
+dir path=usr/bin
+dir path=usr/sbin
+dir path=usr/share group=sys
+dir path=usr/share/gui-install group=sys
+dir path=usr/share/gui-install/help group=sys
+dir path=usr/share/gui-install/help/C group=sys
+dir path=usr/share/gui-install/installmessages group=sys
+file path=etc/gconf/schemas/solaris-gui-install.schemas group=sys
+file path=etc/security/exec_attr.d/SUNWgui-install group=sys
+file path=usr/bin/gui-install mode=0555 group=sys
+file path=usr/sbin/show-license mode=0555
+file path=usr/share/gui-install/city_mouseover_l.png group=sys
+file path=usr/share/gui-install/city_mouseover_s.png group=sys
+file path=usr/share/gui-install/city_normal_l.png group=sys
+file path=usr/share/gui-install/city_normal_s.png group=sys
+file path=usr/share/gui-install/city_selected_l.png group=sys
+file path=usr/share/gui-install/city_selected_s.png group=sys
+file path=usr/share/gui-install/confirmation.glade group=sys
+file path=usr/share/gui-install/date-time-zone.glade group=sys
+file path=usr/share/gui-install/diskbutton.glade group=sys
+file path=usr/share/gui-install/diskupdate-selected.png group=sys
+file path=usr/share/gui-install/diskupdate-unselected.png group=sys
+file path=usr/share/gui-install/failure.glade group=sys
+file path=usr/share/gui-install/gnome-spinner.gif group=sys
+file path=usr/share/gui-install/gui-install.glade group=sys
+file path=usr/share/gui-install/hand.png group=sys
+file path=usr/share/gui-install/help/C/FINISH_PANEL.txt group=sys
+file path=usr/share/gui-install/help/C/INSTALL_DISK_PANEL.txt group=sys
+file path=usr/share/gui-install/help/C/INSTALL_FAILURE_PANEL.txt group=sys
+file path=usr/share/gui-install/help/C/INSTALL_LANGUAGE_PANEL.txt group=sys
+file path=usr/share/gui-install/help/C/INSTALL_PROGRESS_PANEL.txt group=sys
+file path=usr/share/gui-install/help/C/INSTALL_REVIEW_PANEL.txt group=sys
+file path=usr/share/gui-install/help/C/INSTALL_TIMEZONE_PANEL.txt group=sys
+file path=usr/share/gui-install/help/C/INSTALL_USERS_PANEL.txt group=sys
+file path=usr/share/gui-install/help/C/UPGRADE_DISK_PANEL.txt group=sys
+file path=usr/share/gui-install/help/C/UPGRADE_FAILURE_PANEL.txt group=sys
+file path=usr/share/gui-install/help/C/UPGRADE_PROGRESS_PANEL.txt group=sys
+file path=usr/share/gui-install/help/C/UPGRADE_REVIEW_PANEL.txt group=sys
+file path=usr/share/gui-install/help/C/WELCOME_PANEL.txt group=sys
+file path=usr/share/gui-install/installation.glade group=sys
+file path=usr/share/gui-install/installationdisk.glade group=sys
+file path=usr/share/gui-install/installmessages/install-01.png group=sys
+file path=usr/share/gui-install/installmessages/install-02.png group=sys
+file path=usr/share/gui-install/installmessages/install-03.png group=sys
+file path=usr/share/gui-install/installmessages/install-04.png group=sys
+file path=usr/share/gui-install/installmessages/install-05.png group=sys
+file path=usr/share/gui-install/magnifier.png group=sys
+file path=usr/share/gui-install/solaris_logo.png group=sys
+file path=usr/share/gui-install/sun_curve_hacky2.png group=sys
+file path=usr/share/gui-install/sun_logo.png group=sys
+file path=usr/share/gui-install/users.glade group=sys
+file path=usr/share/gui-install/worldmap.png group=sys
+license cr_Sun license=cr_Sun
+license lic_CDDL license=lic_CDDL
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkg/manifests/SUNWslim-utils.mf Mon May 24 17:31:06 2010 -0400
@@ -0,0 +1,92 @@
+#
+# 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) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/SUNWslim-utils@$(PKGVERS)
+set name=pkg.description value="Services used by the Live Media Kit"
+set name=pkg.summary value="Live CD infrastructure"
+set name=info.classification value=org.opensolaris.category.2008:System/Core
+set name=variant.arch value=$(ARCH)
+set name=variant.opensolaris.zone value=global
+dir path=.cdrom group=sys
+dir path=etc group=sys
+dir path=etc/svc group=sys
+dir path=etc/svc/profile group=sys
+dir path=jack owner=jack group=staff
+dir path=jack/.config owner=jack group=staff
+dir path=jack/.config/autostart owner=jack group=staff
+dir path=jack/Desktop owner=jack group=staff
+dir path=jack/Documents owner=jack group=staff
+dir path=lib
+dir path=lib/svc
+dir path=lib/svc/method
+dir path=lib/svc/share
+dir path=mnt group=sys
+dir path=mnt/misc group=sys
+dir path=sbin group=sys
+dir path=usr group=sys
+dir path=usr/sbin
+dir path=usr/share group=sys
+dir path=var group=sys
+dir path=var/svc group=sys
+dir path=var/svc/manifest group=sys
+dir path=var/svc/manifest/system group=sys
+dir path=var/svc/manifest/system/device group=sys
+dir path=var/svc/manifest/system/filesystem group=sys
+file path=etc/svc/profile/network_nwam.xml mode=0444 group=sys
+file path=jack/.bashrc mode=0755 owner=jack group=staff
+file path=jack/.config/autostart/iotrace.desktop owner=jack group=staff
+file path=jack/.config/autostart/ddu_silent.desktop owner=jack group=staff
+file path=jack/.profile mode=0755 owner=jack group=staff
+file path=jack/.Xclients mode=0755 owner=jack group=staff
+file path=jack/.xscreensaver owner=jack group=staff
+file path=jack/Desktop/.os-icons-installed owner=jack group=staff
+file path=jack/Desktop/ddu.desktop owner=jack group=staff
+file path=jack/Desktop/getting_started.desktop owner=jack group=staff
+file path=jack/Desktop/gparted.desktop owner=jack group=staff
+file path=jack/Desktop/install_opensolaris.desktop owner=jack group=staff
+file path=jack/xorg.conf.vesa owner=jack group=staff
+file path=lib/svc/method/live-a11y mode=0555
+file path=lib/svc/method/live-fs-root-minimal mode=0555
+file path=lib/svc/method/live-io-tracing mode=0555
+file path=lib/svc/method/live-sysidtool-system mode=0555
+file path=lib/svc/method/live-var-pkg-move mode=0555
+file path=lib/svc/method/media-fs-root mode=0555
+file path=lib/svc/method/net-fs-root mode=0555
+file path=lib/svc/share/live_fs_include.sh mode=0444
+file path=sbin/listcd mode=0555
+file path=sbin/listusb mode=0555
+file path=sbin/mkmenu mode=0555 variant.arch=i386
+file path=usr/sbin/iotrace
+file path=usr/sbin/set_lang mode=0555
+file path=var/svc/manifest/system/filesystem/live-root-fs-minimal.xml mode=0444 group=sys
+file path=var/svc/manifest/system/filesystem/live-root-fs.xml mode=0444 group=sys
+file path=var/svc/manifest/system/filesystem/live-usr-fs.xml mode=0444 group=sys
+file path=var/svc/manifest/system/live-a11y.xml mode=0444 group=sys
+file path=var/svc/manifest/system/live-io-tracing.xml mode=0444 group=sys
+file path=var/svc/manifest/system/live-sysidtool.xml mode=0444 group=sys
+file path=var/svc/manifest/system/live-var-pkg-move.xml mode=0444 group=sys
+license cr_Sun license=cr_Sun
+license lic_CDDL license=lic_CDDL
+user username=jack uid=65432 group=staff gcos-field="Default User" home-dir=/jack \
+ login-shell=/usr/bin/bash password=9Nd/cwBcNWFZg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkg/manifests/install-beadm.mf Mon May 24 17:31:06 2010 -0400
@@ -0,0 +1,59 @@
+#
+# 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) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/install/beadm@$(PKGVERS)
+set name=pkg.description value="Boot Environment Management Tool"
+set name=pkg.summary value="beadm utility"
+set name=info.classification value=org.opensolaris.category.2008:System/Core
+set name=variant.arch value=$(ARCH)
+set name=variant.opensolaris.zone value=global value=nonglobal
+dir path=etc group=sys
+dir path=etc/security group=sys
+dir path=etc/security/exec_attr.d group=sys
+dir path=etc/security/prof_attr.d group=sys
+dir path=sbin group=sys
+dir path=usr group=sys
+dir path=usr/lib
+dir path=usr/lib/python2.6
+dir path=usr/lib/python2.6/vendor-packages
+dir path=usr/lib/python2.6/vendor-packages/osol_install
+dir path=usr/lib/python2.6/vendor-packages/osol_install/beadm
+dir path=usr/sbin
+dir path=usr/share group=sys
+dir path=usr/share/man
+dir path=usr/share/man/man1m
+file path=etc/security/exec_attr.d/SUNWbeadm group=sys
+file path=etc/security/prof_attr.d/SUNWbeadm group=sys
+file path=sbin/beadm mode=0555
+file path=usr/lib/python2.6/vendor-packages/osol_install/beadm/__init__.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/beadm/__init__.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/beadm/BootEnvironment.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/beadm/BootEnvironment.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/beadm/messages.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/beadm/messages.pyc mode=0444
+file path=usr/share/man/man1m/beadm.1m mode=0444
+license cr_Sun license=cr_Sun
+license lic_CDDL license=lic_CDDL
+link path=usr/sbin/beadm target=../../sbin/beadm
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkg/manifests/install-distribution-constructor.mf Mon May 24 17:31:06 2010 -0400
@@ -0,0 +1,174 @@
+#
+# 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) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/install/distribution-constructor@$(PKGVERS)
+set name=pkg.description \
+ value="Distribution Constructor libraries, commands and data files"
+set name=pkg.summary value="distro_const utility"
+set name=info.classification value=org.opensolaris.category.2008:System/Core
+set name=variant.arch value=$(ARCH)
+set name=variant.opensolaris.zone value=global value=nonglobal
+
+# /usr/bin/gunzip
+depend fmri=compress/gzip type=require
+# /usr/bin/7za
+depend fmri=compress/p7zip type=require
+# /usr/bin/mkisofs
+depend fmri=media/cdrtools type=require
+# /usr/bin/rmformat
+depend fmri=service/storage/media-volume-manager type=require
+# /usr/bin/awk
+depend fmri=system/extended-system-utilities type=require
+# /usr/sbin/zfs
+depend fmri=system/file-system/zfs type=require
+# /usr/xpg4/bin/grep
+depend fmri=system/xopen/xcu4 type=require
+
+dir path=usr group=sys
+dir path=usr/bin
+dir path=usr/lib
+dir path=usr/lib/python2.6
+dir path=usr/lib/python2.6/vendor-packages
+dir path=usr/lib/python2.6/vendor-packages/osol_install
+dir path=usr/lib/python2.6/vendor-packages/osol_install/distro_const
+dir path=usr/share group=sys
+dir path=usr/share/distro_const
+dir path=usr/share/distro_const/auto_install
+dir path=usr/share/distro_const/slim_cd
+dir path=usr/share/distro_const/text_install
+dir path=usr/share/distro_const/vmc
+dir path=usr/share/doc group=other
+dir path=usr/share/doc/distro_const
+dir path=usr/share/doc/distro_const/css
+dir path=usr/share/doc/distro_const/graphics
+dir path=usr/share/man
+dir path=usr/share/man/man1m
+dir path=usr/share/man/man4
+file path=usr/bin/distro_const mode=0555
+file path=usr/bin/proc_slist mode=0555
+file path=usr/bin/proc_tracedata mode=0555
+file path=usr/bin/usbcopy mode=0555
+file path=usr/bin/usbgen mode=0555
+file path=usr/lib/python2.6/vendor-packages/osol_install/distro_const/__init__.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/distro_const/__init__.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/distro_const/dc_checkpoint.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/distro_const/dc_checkpoint.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/distro_const/dc_defs.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/distro_const/dc_defs.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/distro_const/dc_ti.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/distro_const/dc_ti.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/distro_const/dc_utils.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/distro_const/dc_utils.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/distro_const/DefaultsModule.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/distro_const/DefaultsModule.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/distro_const/ValidatorModule.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/distro_const/ValidatorModule.pyc mode=0444
+file path=usr/share/distro_const/auto_install/ai_boot_archive_configure mode=0555
+file path=usr/share/distro_const/auto_install/ai_live.xml mode=0444 group=sys
+file path=usr/share/distro_const/auto_install/ai_pre_boot_archive_pkg_image_mod mode=0555
+file path=usr/share/distro_const/auto_install/ai_publish_pkg mode=0555
+file path=usr/share/distro_const/auto_install/ai_sparc_image.xml mode=0444 group=sys
+file path=usr/share/distro_const/auto_install/ai_x86_image.xml mode=0444 group=sys
+file path=usr/share/distro_const/boot_archive_archive.py mode=0555
+file path=usr/share/distro_const/boot_archive_configure mode=0555
+file path=usr/share/distro_const/boot_archive_initialize.py mode=0555
+file path=usr/share/distro_const/boot_archive_strip mode=0555
+file path=usr/share/distro_const/create_iso mode=0555
+file path=usr/share/distro_const/create_usb mode=0555
+file path=usr/share/distro_const/DC-manifest.defval.xml mode=0444 group=sys
+file path=usr/share/distro_const/DC-manifest.rng mode=0444 group=sys
+file path=usr/share/distro_const/finalizer_checkpoint.py mode=0555
+file path=usr/share/distro_const/finalizer_rollback.py mode=0555
+file path=usr/share/distro_const/gen_cd_content mode=0555
+file path=usr/share/distro_const/generic_live.xml mode=0444 group=sys
+file path=usr/share/distro_const/grub_setup.py mode=0555
+file path=usr/share/distro_const/im_pop.py mode=0555
+file path=usr/share/distro_const/mkrepo mode=0555
+file path=usr/share/distro_const/plat_setup.py mode=0555
+file path=usr/share/distro_const/post_boot_archive_pkg_image_mod mode=0555
+file path=usr/share/distro_const/post_boot_archive_pkg_image_mod_custom mode=0555
+file path=usr/share/distro_const/pre_boot_archive_pkg_image_mod.py mode=0555
+file path=usr/share/distro_const/slim_cd/all_lang_slim_cd_x86.xml mode=0444 group=sys
+file path=usr/share/distro_const/slim_cd/slim_cd_x86.xml mode=0444 group=sys
+file path=usr/share/distro_const/slim_cd/slimcd_boot_archive_configure mode=0555
+file path=usr/share/distro_const/slim_cd/slimcd_iso.sort mode=0444 group=sys
+file path=usr/share/distro_const/slim_cd/slimcd_live.xml mode=0444 group=sys
+file path=usr/share/distro_const/slim_cd/slimcd_post_boot_archive_pkg_image_mod mode=0555
+file path=usr/share/distro_const/slim_cd/slimcd_pre_boot_archive_pkg_image_mod mode=0555
+file path=usr/share/distro_const/text_install/text_install_x86_iso.sort mode=0444 group=sys
+file path=usr/share/distro_const/text_install/text_live.xml mode=0444 group=sys
+file path=usr/share/distro_const/text_install/text_mode_sparc.xml mode=0444 group=sys
+file path=usr/share/distro_const/text_install/text_mode_x86.xml mode=0444 group=sys
+file path=usr/share/distro_const/text_install/tm_pre_boot_archive_pkg_image_mod mode=0555
+file path=usr/share/distro_const/vmc/create_vm mode=0555
+file path=usr/share/distro_const/vmc/export_vm mode=0555
+file path=usr/share/distro_const/vmc/install_vm mode=0555
+file path=usr/share/distro_const/vmc/post_install_vm_config mode=0555
+file path=usr/share/distro_const/vmc/prepare_ai_image mode=0555
+file path=usr/share/distro_const/vmc/vmc_common mode=0444
+file path=usr/share/distro_const/vmc/vmc_image.xml mode=0444 group=sys
+file path=usr/share/doc/distro_const/addimage.html mode=0444
+file path=usr/share/doc/distro_const/addl.html mode=0444
+file path=usr/share/doc/distro_const/addpkg.html mode=0444
+file path=usr/share/doc/distro_const/appendix.html mode=0444
+file path=usr/share/doc/distro_const/bootimage.html mode=0444
+file path=usr/share/doc/distro_const/buildvm.html mode=0444
+file path=usr/share/doc/distro_const/buildvmc.html mode=0444
+file path=usr/share/doc/distro_const/command.html mode=0444
+file path=usr/share/doc/distro_const/css/advanced.css mode=0444
+file path=usr/share/doc/distro_const/css/elements.css mode=0444
+file path=usr/share/doc/distro_const/css/opensol.css mode=0444
+file path=usr/share/doc/distro_const/customvmc.html mode=0444
+file path=usr/share/doc/distro_const/diffs.html mode=0444
+file path=usr/share/doc/distro_const/distconstguide.html mode=0444
+file path=usr/share/doc/distro_const/distro_const.html mode=0444
+file path=usr/share/doc/distro_const/distroconst.html mode=0444
+file path=usr/share/doc/distro_const/docinfo.html mode=0444
+file path=usr/share/doc/distro_const/files.html mode=0444
+file path=usr/share/doc/distro_const/graphics/header_gradientpart.png mode=0444
+file path=usr/share/doc/distro_const/graphics/opensolaris_logo_trans.png mode=0444
+file path=usr/share/doc/distro_const/how.html mode=0444
+file path=usr/share/doc/distro_const/index.html mode=0444
+file path=usr/share/doc/distro_const/manifest.html mode=0444
+file path=usr/share/doc/distro_const/manifestfile.html mode=0444
+file path=usr/share/doc/distro_const/overview.html mode=0444
+file path=usr/share/doc/distro_const/scripts.html mode=0444
+file path=usr/share/doc/distro_const/setup.html mode=0444
+file path=usr/share/doc/distro_const/sysreq.html mode=0444
+file path=usr/share/doc/distro_const/testpkg.html mode=0444
+file path=usr/share/doc/distro_const/trouble.html mode=0444
+file path=usr/share/doc/distro_const/troublevm.html mode=0444
+file path=usr/share/doc/distro_const/using.html mode=0444
+file path=usr/share/doc/distro_const/vm.html mode=0444
+file path=usr/share/doc/distro_const/vmcblog.html mode=0444
+file path=usr/share/doc/distro_const/vmsysreq.html mode=0444
+file path=usr/share/doc/distro_const/whatis.html mode=0444
+file path=usr/share/man/man1m/distro_const.1m mode=0444
+file path=usr/share/man/man4/dc_manifest.4 mode=0444
+license cr_Sun license=cr_Sun
+license lic_CDDL license=lic_CDDL
+link path=usr/share/distro_const/boot_archive_archive_32 target=boot_archive_archive.py
+link path=usr/share/distro_const/vmc/export_esx target=export_vm
+link path=usr/share/distro_const/vmc/export_ovf target=export_vm
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkg/manifests/install-installadm.mf Mon May 24 17:31:06 2010 -0400
@@ -0,0 +1,167 @@
+#
+# 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) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/install/installadm@$(PKGVERS)
+set name=pkg.description value="Automatic Installation Server Setup Tools"
+set name=pkg.summary value="installadm utility"
+set name=info.classification value="org.opensolaris.category.2008:System/Administration and Configuration"
+set name=variant.arch value=$(ARCH)
+set name=variant.opensolaris.zone value=global value=nonglobal
+
+depend fmri=database/sqlite-3 type=require
+depend fmri=library/python-2/cherrypy type=require
+depend fmri=library/python-2/lxml-26 type=require
+depend fmri=service/network/dhcp type=require
+depend fmri=service/network/dns/mdns type=require
+depend fmri=service/network/tftp type=require
+depend fmri=system/install/auto-install/auto-install-common type=require
+depend fmri=web/server/apache-22 type=require
+
+dir path=lib
+dir path=lib/svc
+dir path=lib/svc/method
+dir path=usr group=sys
+dir path=usr/lib
+dir path=usr/lib/installadm
+dir path=usr/lib/python2.6
+dir path=usr/lib/python2.6/vendor-packages
+dir path=usr/lib/python2.6/vendor-packages/osol_install
+dir path=usr/lib/python2.6/vendor-packages/osol_install/auto_install
+dir path=usr/sbin
+dir path=usr/share group=sys
+dir path=usr/share/auto_install/ group=sys
+dir path=usr/share/doc group=other
+dir path=usr/share/doc/auto_install
+dir path=usr/share/doc/auto_install/css
+dir path=usr/share/doc/auto_install/figures
+dir path=usr/share/doc/auto_install/graphics
+dir path=usr/share/man
+dir path=usr/share/man/man1m
+dir path=usr/share/xml
+dir path=var group=sys
+dir path=var/ai group=sys
+dir path=var/ai/image-server group=sys
+dir path=var/ai/image-server/cgi-bin group=sys
+dir path=var/ai/image-server/images group=sys
+dir path=var/ai/image-server/logs group=sys
+dir path=var/installadm group=sys
+dir path=var/installadm/ai-webserver group=sys
+dir path=var/installadm/ai-webserver/AI_data group=sys
+dir path=var/installadm/ai-webserver/AI_files group=sys
+dir path=var/installadm/services group=sys
+dir path=var/svc group=sys
+dir path=var/svc/manifest group=sys
+dir path=var/svc/manifest/system group=sys
+dir path=var/svc/manifest/system/install group=sys
+file path=lib/svc/method/svc-install-server mode=0555
+file path=usr/lib/installadm/check-server-setup
+file path=usr/lib/installadm/create_client.py
+file path=usr/lib/installadm/delete_client.py
+file path=usr/lib/installadm/delete_service.py
+file path=usr/lib/installadm/delete-manifest
+file path=usr/lib/installadm/installadm-common
+file path=usr/lib/installadm/list
+file path=usr/lib/installadm/publish-manifest
+file path=usr/lib/installadm/setup-dhcp
+file path=usr/lib/installadm/setup-image
+file path=usr/lib/installadm/setup-service
+file path=usr/lib/installadm/setup-sparc
+file path=usr/lib/installadm/setup-tftp-links
+file path=usr/lib/installadm/webserver
+file path=usr/lib/python2.6/vendor-packages/osol_install/_libaiscf.so mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/auto_install/AI_database.py group=sys
+file path=usr/lib/python2.6/vendor-packages/osol_install/auto_install/AI_database.pyc group=sys
+file path=usr/lib/python2.6/vendor-packages/osol_install/auto_install/installadm_common.py group=sys
+file path=usr/lib/python2.6/vendor-packages/osol_install/auto_install/installadm_common.pyc group=sys
+file path=usr/lib/python2.6/vendor-packages/osol_install/auto_install/verifyXML.py group=sys
+file path=usr/lib/python2.6/vendor-packages/osol_install/auto_install/verifyXML.pyc group=sys
+file path=usr/lib/python2.6/vendor-packages/osol_install/libaiscf.py mode=0444
+file path=usr/sbin/installadm
+file path=usr/share/auto_install/criteria_schema.rng group=sys
+file path=usr/share/doc/auto_install/add.html mode=0444
+file path=usr/share/doc/auto_install/administer.html mode=0444
+file path=usr/share/doc/auto_install/advancedsetup.html mode=0444
+file path=usr/share/doc/auto_install/aimanifest.html mode=0444
+file path=usr/share/doc/auto_install/appendix.html mode=0444
+file path=usr/share/doc/auto_install/associate.html mode=0444
+file path=usr/share/doc/auto_install/autoinstall.html mode=0444
+file path=usr/share/doc/auto_install/basic.html mode=0444
+file path=usr/share/doc/auto_install/benefits.html mode=0444
+file path=usr/share/doc/auto_install/bootable.html mode=0444
+file path=usr/share/doc/auto_install/bootableclientreq.html mode=0444
+file path=usr/share/doc/auto_install/bothclient.html mode=0444
+file path=usr/share/doc/auto_install/cclient.html mode=0444
+file path=usr/share/doc/auto_install/client.html mode=0444
+file path=usr/share/doc/auto_install/clientinstall.html mode=0444
+file path=usr/share/doc/auto_install/clientreq.html mode=0444
+file path=usr/share/doc/auto_install/clients.html mode=0444
+file path=usr/share/doc/auto_install/criteria.html mode=0444
+file path=usr/share/doc/auto_install/css/advanced.css mode=0444
+file path=usr/share/doc/auto_install/css/elements.css mode=0444
+file path=usr/share/doc/auto_install/css/opensol.css mode=0444
+file path=usr/share/doc/auto_install/customai.html mode=0444
+file path=usr/share/doc/auto_install/customsc.html mode=0444
+file path=usr/share/doc/auto_install/delclient.html mode=0444
+file path=usr/share/doc/auto_install/delete.html mode=0444
+file path=usr/share/doc/auto_install/docinfo.html mode=0444
+file path=usr/share/doc/auto_install/enable.html mode=0444
+file path=usr/share/doc/auto_install/faq.html mode=0444
+file path=usr/share/doc/auto_install/figures/aiflow.gif mode=0444
+file path=usr/share/doc/auto_install/figures/AIinstall.gif mode=0444
+file path=usr/share/doc/auto_install/figures/bootableAI_1.gif mode=0444
+file path=usr/share/doc/auto_install/gentextid-45.html mode=0444
+file path=usr/share/doc/auto_install/graphics/header_gradientpart.png mode=0444
+file path=usr/share/doc/auto_install/graphics/opensolaris_logo_trans.png mode=0444
+file path=usr/share/doc/auto_install/help.html mode=0444
+file path=usr/share/doc/auto_install/howbootable.html mode=0444
+file path=usr/share/doc/auto_install/index.html mode=0444
+file path=usr/share/doc/auto_install/initial.html mode=0444
+file path=usr/share/doc/auto_install/installadm.html mode=0444
+file path=usr/share/doc/auto_install/intro.html mode=0444
+file path=usr/share/doc/auto_install/manifest.html mode=0444
+file path=usr/share/doc/auto_install/manifest1.html mode=0444
+file path=usr/share/doc/auto_install/scenario.html mode=0444
+file path=usr/share/doc/auto_install/setup.html mode=0444
+file path=usr/share/doc/auto_install/setupfaq.html mode=0444
+file path=usr/share/doc/auto_install/simple.html mode=0444
+file path=usr/share/doc/auto_install/smf.html mode=0444
+file path=usr/share/doc/auto_install/sparcclient.html mode=0444
+file path=usr/share/doc/auto_install/tasks.html mode=0444
+file path=usr/share/doc/auto_install/tasks1.html mode=0444
+file path=usr/share/doc/auto_install/trouble.html mode=0444
+file path=usr/share/doc/auto_install/use.html mode=0444
+file path=usr/share/doc/auto_install/view.html mode=0444
+file path=usr/share/doc/auto_install/whatis.html mode=0444
+file path=usr/share/doc/auto_install/whybootable.html mode=0444
+file path=usr/share/doc/auto_install/x86client.html mode=0444
+file path=usr/share/man/man1m/installadm.1m mode=0444
+file path=var/installadm/ai-webserver/ai-httpd.conf
+file path=var/installadm/ai-webserver/AI.db
+file path=var/svc/manifest/system/install/server.xml group=sys
+license cr_Sun license=cr_Sun
+license lic_CDDL license=lic_CDDL
+link path=usr/lib/installadm/create-client target=create_client.py
+link path=usr/lib/installadm/delete-client target=delete_client.py
+link path=usr/lib/installadm/delete-service target=delete_service.py
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkg/manifests/system-install-auto-install-auto-install-common.mf Mon May 24 17:31:06 2010 -0400
@@ -0,0 +1,47 @@
+#
+# 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) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/system/install/auto-install/auto-install-common@$(PKGVERS)
+set name=pkg.description value="Automated Installer common components"
+set name=pkg.summary value="Automated Installer common components"
+set name=info.classification value="org.opensolaris.category.2008:System/Administration and Configuration"
+set name=variant.arch value=$(ARCH)
+set name=variant.opensolaris.zone value=global value=nonglobal
+dir path=usr group=sys
+dir path=usr/lib
+dir path=usr/lib/python2.6
+dir path=usr/lib/python2.6/vendor-packages
+dir path=usr/lib/python2.6/vendor-packages/osol_install
+dir path=usr/lib/python2.6/vendor-packages/osol_install/auto_install
+dir path=usr/share group=sys
+dir path=usr/share/auto_install group=sys
+file path=usr/lib/python2.6/vendor-packages/osol_install/auto_install/__init__.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/auto_install/__init__.pyc mode=0444
+file path=usr/share/auto_install/ai_manifest.rng mode=0444 group=sys
+file path=usr/share/auto_install/ai_manifest.xml mode=0444 group=sys
+file path=usr/share/auto_install/default.xml mode=0444 group=sys
+license cr_Sun license=cr_Sun
+license lic_CDDL license=lic_CDDL
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkg/manifests/system-install-auto-install.mf Mon May 24 17:31:06 2010 -0400
@@ -0,0 +1,62 @@
+#
+# 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) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/system/install/auto-install@$(PKGVERS)
+set name=pkg.summary value="Automated Installer Client Components"
+set name=pkg.description value="Automated Installer Client Components"
+set name=info.classification value="org.opensolaris.category.2008:System/Administration and Configuration"
+set name=variant.arch value=$(ARCH)
+set name=variant.opensolaris.zone value=global
+dir path=lib
+dir path=lib/svc
+dir path=lib/svc/method
+dir path=usr group=sys
+dir path=usr/bin
+dir path=usr/sbin
+dir path=usr/lib
+dir path=usr/lib/python2.6
+dir path=usr/lib/python2.6/vendor-packages
+dir path=usr/lib/python2.6/vendor-packages/osol_install
+dir path=usr/lib/python2.6/vendor-packages/osol_install/auto_install
+dir path=usr/share group=sys
+dir path=usr/share/auto_install group=sys
+dir path=var group=sys
+dir path=var/svc group=sys
+dir path=var/svc/manifest group=sys
+dir path=var/svc/manifest/application group=sys
+file path=lib/svc/method/auto-installer mode=0555
+file path=lib/svc/method/manifest-locator mode=0555
+file path=usr/bin/ai_get_manifest mode=0555
+file path=usr/bin/ai_sd mode=0555
+file path=usr/bin/auto-install mode=0555
+file path=usr/lib/python2.6/vendor-packages/osol_install/auto_install/ai_parse_manifest.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/auto_install/ai_parse_manifest.pyc mode=0444
+file path=usr/sbin/get_manifest mode=0555
+file path=usr/share/auto_install/ai_manifest.defval.xml group=sys
+file path=var/svc/manifest/application/auto-installer.xml mode=0444 group=sys
+file path=var/svc/manifest/application/manifest-locator.xml mode=0444 group=sys
+license cr_Sun license=cr_Sun
+license lic_CDDL license=lic_CDDL
+link path=usr/lib/python2.6/vendor-packages/osol_install/auto_install/ai_get_manifest.py target=../../../../../bin/ai_get_manifest
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkg/manifests/system-install-tests.mf Mon May 24 17:31:06 2010 -0400
@@ -0,0 +1,46 @@
+#
+# 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) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/system/install/tests@$(PKGVERS)
+set name=pkg.description value="Test utilities for Solaris installation"
+set name=pkg.summary value="Solaris install test utilities"
+set name=info.classification value="org.opensolaris.category.2008:System/Administration and Configuration"
+set name=variant.arch value=$(ARCH)
+set name=variant.opensolaris.zone value=global value=nonglobal
+dir path=opt group=sys
+dir path=opt/install-test group=sys
+dir path=opt/install-test/bin
+dir path=usr group=sys
+dir path=usr/include
+file path=opt/install-test/bin/tdmgtst mode=0555
+file path=opt/install-test/bin/tdmgtst_static mode=0555
+file path=opt/install-test/bin/test_td mode=0555
+file path=opt/install-test/bin/test_td_static mode=0555
+file path=opt/install-test/bin/test_ti mode=0555
+file path=opt/install-test/bin/test_ti_static mode=0555
+file path=usr/include/liberrsvc_defs.h
+file path=usr/include/liberrsvc.h
+license cr_Sun license=cr_Sun
+license lic_CDDL license=lic_CDDL
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkg/manifests/system-install-text-install.mf Mon May 24 17:31:06 2010 -0400
@@ -0,0 +1,150 @@
+#
+# 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) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/system/install/text-install@$(PKGVERS)
+set name=pkg.description value="Text Installer libraries, commands, and data files"
+set name=pkg.summary value="Solaris Text Installer"
+set name=info.classification value="org.opensolaris.category.2008:System/Administration and Configuration"
+set name=variant.arch value=$(ARCH)
+set name=variant.opensolaris.zone value=global
+dir path=opt group=sys
+dir path=opt/install-test group=sys
+dir path=opt/install-test/bin
+dir path=usr group=sys
+dir path=usr/bin
+dir path=usr/lib
+dir path=usr/lib/python2.6
+dir path=usr/lib/python2.6/vendor-packages
+dir path=usr/lib/python2.6/vendor-packages/osol_install
+dir path=usr/lib/python2.6/vendor-packages/osol_install/profile
+dir path=usr/lib/python2.6/vendor-packages/osol_install/text_install
+dir path=usr/sbin
+dir path=usr/share group=sys
+dir path=usr/share/text-install group=sys
+dir path=usr/share/text-install/help group=sys
+dir path=usr/share/text-install/help/C group=sys
+dir path=var group=sys
+dir path=var/svc group=sys
+dir path=var/svc/manifest group=sys
+dir path=var/svc/manifest/system group=sys
+file path=opt/install-test/bin/ict_test mode=0555
+file path=usr/bin/text-install mode=0555 group=sys
+file path=usr/lib/python2.6/vendor-packages/osol_install/profile/__init__.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/profile/__init__.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/profile/disk_info.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/profile/disk_info.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/profile/disk_space.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/profile/disk_space.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/profile/install_profile.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/profile/install_profile.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/profile/ip_address.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/profile/ip_address.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/profile/network_info.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/profile/network_info.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/profile/partition_info.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/profile/partition_info.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/profile/slice_info.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/profile/slice_info.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/profile/system_info.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/profile/system_info.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/profile/user_info.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/profile/user_info.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/__init__.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/__init__.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/action.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/action.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/base_screen.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/base_screen.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/color_theme.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/color_theme.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/date_time.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/date_time.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/disk_selection.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/disk_selection.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/disk_window.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/disk_window.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/edit_field.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/edit_field.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/error_window.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/error_window.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/fdisk_partitions.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/fdisk_partitions.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/help_screen.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/help_screen.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/inner_window.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/inner_window.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/install_progress.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/install_progress.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/install_status.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/install_status.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/list_item.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/list_item.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/log_viewer.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/log_viewer.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/main_window.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/main_window.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/network_nic_configure.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/network_nic_configure.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/network_nic_select.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/network_nic_select.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/network_type.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/network_type.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/partition_edit_screen.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/partition_edit_screen.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/screen_list.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/screen_list.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/scroll_window.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/scroll_window.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/summary.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/summary.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/ti_install_utils.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/ti_install_utils.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/ti_install.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/ti_install.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/timezone.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/timezone.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/users.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/users.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/welcome.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/welcome.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/window_area.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/text_install/window_area.pyc mode=0444
+file path=usr/sbin/text-mode-menu mode=0555
+file path=usr/share/text-install/help/C/date_time.txt group=sys
+file path=usr/share/text-install/help/C/disks.txt group=sys
+file path=usr/share/text-install/help/C/network_manual.txt group=sys
+file path=usr/share/text-install/help/C/network.txt group=sys
+file path=usr/share/text-install/help/C/sparc_solaris_slices_select.txt group=sys
+file path=usr/share/text-install/help/C/sparc_solaris_slices.txt group=sys
+file path=usr/share/text-install/help/C/summary.txt group=sys
+file path=usr/share/text-install/help/C/timezone.txt group=sys
+file path=usr/share/text-install/help/C/users.txt group=sys
+file path=usr/share/text-install/help/C/welcome.txt group=sys
+file path=usr/share/text-install/help/C/x86_fdisk_partitions_select.txt group=sys
+file path=usr/share/text-install/help/C/x86_fdisk_partitions.txt group=sys
+file path=usr/share/text-install/help/C/x86_fdisk_slices_select.txt group=sys
+file path=usr/share/text-install/help/C/x86_fdisk_slices.txt group=sys
+file path=var/svc/manifest/system/text-mode-menu.xml mode=0444 group=sys
+license cr_Sun license=cr_Sun
+license lic_CDDL license=lic_CDDL
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkg/manifests/system-install.mf Mon May 24 17:31:06 2010 -0400
@@ -0,0 +1,96 @@
+#
+# 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) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+set name=pkg.fmri value=pkg:/system/install@$(PKGVERS)
+set name=pkg.description value="Core software libraries and commands used for system installation"
+set name=pkg.summary value="System install libraries and commands"
+set name=info.classification value="org.opensolaris.category.2008:System/Administration and Configuration"
+set name=variant.arch value=$(ARCH)
+set name=variant.opensolaris.zone value=global value=nonglobal
+depend fmri=install/beadm type=require
+depend fmri=library/python-2/python-extra-26 type=require
+dir path=sbin group=sys
+dir path=usr group=sys
+dir path=usr/bin
+dir path=usr/include
+dir path=usr/include/admin
+dir path=usr/lib
+dir path=usr/lib/python2.6
+dir path=usr/lib/python2.6/vendor-packages
+dir path=usr/lib/python2.6/vendor-packages/osol_install
+dir path=usr/sbin
+dir path=usr/share group=sys
+dir path=usr/share/lib group=sys
+dir path=usr/share/lib/xml group=sys
+dir path=usr/share/lib/xml/rng group=sys
+dir path=usr/snadm
+dir path=usr/snadm/lib
+file path=sbin/install-finish mode=0555
+file path=usr/bin/ManifestRead mode=0555
+file path=usr/bin/ManifestServ mode=0555
+file path=usr/include/admin/ti_api.h
+file path=usr/include/admin/transfermod.h
+file path=usr/lib/python2.6/vendor-packages/osol_install/__init__.py mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/__init__.pyc mode=0444
+file path=usr/lib/python2.6/vendor-packages/osol_install/DefValProc.py
+file path=usr/lib/python2.6/vendor-packages/osol_install/DefValProc.pyc
+file path=usr/lib/python2.6/vendor-packages/osol_install/ENParser.py
+file path=usr/lib/python2.6/vendor-packages/osol_install/ENParser.pyc
+file path=usr/lib/python2.6/vendor-packages/osol_install/finalizer.py
+file path=usr/lib/python2.6/vendor-packages/osol_install/finalizer.pyc
+file path=usr/lib/python2.6/vendor-packages/osol_install/ict.py
+file path=usr/lib/python2.6/vendor-packages/osol_install/ict.pyc
+file path=usr/lib/python2.6/vendor-packages/osol_install/install_utils.py
+file path=usr/lib/python2.6/vendor-packages/osol_install/install_utils.pyc
+file path=usr/lib/python2.6/vendor-packages/osol_install/liblogsvc.so
+file path=usr/lib/python2.6/vendor-packages/osol_install/libti.so
+link path=usr/lib/python2.6/vendor-packages/osol_install/libtransfer.so target=../../../../snadm/lib/libtransfer.so
+file path=usr/lib/python2.6/vendor-packages/osol_install/libzoneinfo.so
+file path=usr/lib/python2.6/vendor-packages/osol_install/ManifestRead.py
+file path=usr/lib/python2.6/vendor-packages/osol_install/ManifestRead.pyc
+file path=usr/lib/python2.6/vendor-packages/osol_install/ManifestServ.py
+file path=usr/lib/python2.6/vendor-packages/osol_install/ManifestServ.pyc
+file path=usr/lib/python2.6/vendor-packages/osol_install/SocketServProtocol.py
+file path=usr/lib/python2.6/vendor-packages/osol_install/SocketServProtocol.pyc
+file path=usr/lib/python2.6/vendor-packages/osol_install/tgt.so
+file path=usr/lib/python2.6/vendor-packages/osol_install/tgt_utils.py
+file path=usr/lib/python2.6/vendor-packages/osol_install/tgt_utils.pyc
+file path=usr/lib/python2.6/vendor-packages/osol_install/ti_defs.py
+file path=usr/lib/python2.6/vendor-packages/osol_install/ti_defs.pyc
+file path=usr/lib/python2.6/vendor-packages/osol_install/transfer_defs.py
+file path=usr/lib/python2.6/vendor-packages/osol_install/transfer_defs.pyc
+file path=usr/lib/python2.6/vendor-packages/osol_install/transfer_mod.py
+file path=usr/lib/python2.6/vendor-packages/osol_install/transfer_mod.pyc
+file path=usr/lib/python2.6/vendor-packages/osol_install/TreeAcc.py
+file path=usr/lib/python2.6/vendor-packages/osol_install/TreeAcc.pyc
+file path=usr/share/lib/xml/rng/defval-manifest.rng group=sys
+file path=usr/snadm/lib/libict.so.1
+file path=usr/snadm/lib/liblogsvc.so.1
+file path=usr/snadm/lib/liborchestrator.so.1
+file path=usr/snadm/lib/libtd.so.1
+file path=usr/snadm/lib/libti.so.1
+file path=usr/snadm/lib/libtransfer.so.1
+license cr_Sun license=cr_Sun
+license lic_CDDL license=lic_CDDL
+link path=usr/snadm/lib/libtransfer.so target=libtransfer.so.1
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkg/manifests/system-library-install.mf Mon May 24 17:31:06 2010 -0400
@@ -0,0 +1,54 @@
+#
+# 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) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/system/library/install@$(PKGVERS)
+set name=pkg.description value="Core software libraries used for system installation"
+set name=pkg.summary value="System install libraries"
+set name=info.classification value=org.opensolaris.category.2008:System/Libraries
+set name=variant.arch value=$(ARCH)
+set name=variant.opensolaris.zone value=global value=nonglobal
+dir path=usr group=sys
+dir path=usr/lib
+dir path=usr/lib/python2.6
+dir path=usr/lib/python2.6/vendor-packages
+dir path=usr/lib/python2.6/vendor-packages/osol_install
+dir path=usr/snadm
+dir path=usr/snadm/lib
+file path=usr/lib/libaiscf.so.1
+file path=usr/lib/libbe.so.1
+file path=usr/lib/liberrsvc.so.1
+file path=usr/lib/python2.6/vendor-packages/libbe.so
+file path=usr/lib/python2.6/vendor-packages/osol_install/_liberrsvc.so
+file path=usr/lib/python2.6/vendor-packages/osol_install/errsvc.py
+file path=usr/lib/python2.6/vendor-packages/osol_install/errsvc.pyc
+file path=usr/lib/python2.6/vendor-packages/osol_install/liberrsvc.py
+file path=usr/lib/python2.6/vendor-packages/osol_install/liberrsvc.pyc
+file path=usr/snadm/lib/libspmicommon.so.1
+license cr_Sun license=cr_Sun
+license lic_CDDL license=lic_CDDL
+link path=usr/lib/libaiscf.so target=libaiscf.so.1
+link path=usr/lib/libbe.so target=libbe.so.1
+link path=usr/lib/liberrsvc.so target=liberrsvc.so.1
+link path=usr/snadm/lib/libspmicommon.so target=libspmicommon.so.1
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkg/transforms/defaults Mon May 24 17:31:06 2010 -0400
@@ -0,0 +1,80 @@
+#
+# 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) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+#
+# This isn't really a transform, but it's a valid default.
+#
+set name=org.opensolaris.consolidation value=install
+
+#
+# For kernel/drv, set .conf files to mode 0644. Assume all other
+# files there are drivers, and give them mode 0755 and reboot-needed.
+#
+# The (?<!r) construct in the reboot-needed transform is a negative
+# lookbehind assertion: it says "only match this regex if the
+# previously matched text does NOT match regex r." So it will match
+# all files in the various kernel trees, except for .conf files.
+#
+<transform file path=.*kernel/drv/.+\.conf -> default mode 0644>
+<transform file path=.*kernel/drv/.+ -> default mode 0755>
+<transform file path=.*kernel/.+(?<!\.conf)$ -> default reboot-needed true>
+
+#
+# shared objects should generally have mode 0755
+#
+<transform file path=.*lib/.*\.so.* -> default mode 0755>
+
+#
+# Catch some of the collections of largely read-only files
+#
+<transform file path=usr/lib/help/.+ -> default mode 0444>
+<transform file path=usr/share/doc/ksh/.+ -> default mode 0644>
+<transform file path=usr/share/ipfilter/.+ -> default mode 0644>
+<transform file path=usr/share/lib/ccs/.+ -> default mode 0644>
+<transform file path=usr/share/lib/java/.+ -> default mode 0644>
+<transform file path=usr/share/lib/locale/com/sun/dhcpmgr/.+\.properties -> default mode 0644>
+<transform file path=usr/share/lib/locale/com/sun/dhcpmgr/.+ -> default mode 0444>
+<transform file path=usr/share/lib/locale/com/sun/.+ -> default mode 0644>
+<transform file path=usr/share/lib/mailx/.+ -> default mode 0644>
+<transform file path=usr/share/lib/nterm/.+ -> default mode 0644>
+<transform file path=usr/share/lib/pub/.+ -> default mode 0644>
+<transform file path=usr/share/lib/sgml/.+ -> default mode 0644>
+<transform file path=usr/share/lib/slp/.+ -> default mode 0644>
+<transform file path=usr/share/lib/tabset/.+ -> default mode 0644>
+<transform file path=usr/share/lib/t.+ -> default mode 0644>
+<transform file path=usr/share/lib/unittab/.+ -> default mode 0644>
+<transform file path=usr/share/lib/zoneinfo/.+ -> default mode 0644>
+<transform file path=usr/share/src/grub/.+ -> default mode 0644>
+<transform file path=usr/share/.+ -> default mode 0444>
+
+
+#
+# For what's left, go with root:bin 0644, +x for directories
+#
+#
+<transform file dir -> default owner root>
+<transform file dir -> default group bin>
+<transform file -> default mode 0644>
+<transform dir -> default mode 0755>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkg/transforms/extract_metadata Mon May 24 17:31:06 2010 -0400
@@ -0,0 +1,43 @@
+#
+# 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) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+#
+# All nonredistributable packages go to extra, for the purposes of the
+# osnet build.
+#
+<transform set name=org.opensolaris.redist value=nonredist|internal -> print REPO=extra>
+
+#
+# Ordering is important here, and the last line wins.
+#
+# The default of "current" is provided by the calling environment,
+# rather than a print operation.
+#
+<transform set name=pkg.renamed value=true -> print PKGSTAT=renamed>
+<transform set name=pkg.obsolete value=true -> print PKGSTAT=obsolete>
+<transform set name=org.opensolaris.nodepend value=true -> print NODEPEND=true>
+<transform set name=org.opensolaris.nodepend -> drop>
+<transform set name=org.opensolaris.noincorp value=true -> print PKGSTAT=noincorp>
+<transform set name=org.opensolaris.noincorp -> drop>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkg/transforms/hollow_zone_pkg Mon May 24 17:31:06 2010 -0400
@@ -0,0 +1,30 @@
+#
+# 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) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+#
+# A hollow package is one that installs into all zones, but only
+# delivers content to the global zone.
+#
+<transform dir driver file link hardlink -> set variant.opensolaris.zone global>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkg/transforms/publish Mon May 24 17:31:06 2010 -0400
@@ -0,0 +1,51 @@
+#
+# 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) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+#
+# Only publish packages for the currently specified architecture
+#
+# This is somewhat nonintuitive. In English:
+#
+# For any action of type "set",
+# if the "name" property matches the regex "variant.arch",
+# and *every* occurrence of the "value" property does not match
+# $ARCH, then don't publish it.
+#
+# ...in other words, if *any* occurrence of "value" matches $(ARCH),
+# then the negative lookahead assertion in the regex will fail, and we
+# won't abort based on the action.
+#
+<transform set name=variant.arch value=^(?!$(ARCH)).+$ -> abort>
+
+#
+# Don't publish nonredistributable manifests in an open-only build
+#
+$(OPEN_BUILD)<transform set name=org.opensolaris.redist value=nonredist|internal -> abort>
+
+#
+# Catch don't-publish settings from manifest-embedded transforms
+#
+<transform set name=install.publish value=false -> abort>
+<transform set name=install.publish -> drop>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkg/transforms/restart_fmri Mon May 24 17:31:06 2010 -0400
@@ -0,0 +1,29 @@
+#
+# 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) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+<transform file path=var/svc/manifest/.*\.xml -> add restart_fmri svc:/system/manifest-import:default>
+<transform file path=lib/svc/manifest/.*\.xml -> add restart_fmri svc:/system/manifest-import:default>
+<transform file path=etc/security/[^/]+_attr.d/.+ -> add restart_fmri svc:/system/rbac:default>
+<transform file path=etc/user_attr.d/.+ -> add restart_fmri svc:/system/rbac:default>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkg/transforms/synthetic Mon May 24 17:31:06 2010 -0400
@@ -0,0 +1,34 @@
+#
+# 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) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+#
+# When we process the synthetic manifests, we don't know if a "make
+# clobber" was done or not. This keeps us from having silly,
+# self-referential dependencies in 'em, even when they make it into
+# the package lists.
+#
+<transform depend fmri=pkg:/install_all@.+ -> drop>
+<transform depend fmri=pkg:/install_extra@.+ -> drop>
+<transform depend fmri=pkg:/consolidation/install/install-incorporation@.+ -> drop>
--- a/usr/src/pkgdefs/SUNWgui-install/prototype_com Fri May 21 08:53:04 2010 -0600
+++ b/usr/src/pkgdefs/SUNWgui-install/prototype_com Mon May 24 17:31:06 2010 -0400
@@ -19,8 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
#
@@ -51,7 +50,7 @@
d none usr/share/gui-install/help 0755 root sys
d none usr/share/gui-install/help/C 0755 root sys
d none usr/share/gui-install/installmessages 0755 root sys
-f none etc/gconf/schemas/solaris-gui-install.schemas=usr/share/gui-install/solaris-gui-install.schemas 0644 root sys
+f none etc/gconf/schemas/solaris-gui-install.schemas 0644 root sys
f none etc/security/exec_attr.d/SUNWgui-install 0644 root sys
f none usr/bin/gui-install 0555 root sys
f none usr/sbin/show-license 0555 root bin
@@ -70,26 +69,26 @@
f none usr/share/gui-install/gnome-spinner.gif 0644 root sys
f none usr/share/gui-install/gui-install.glade 0644 root sys
f none usr/share/gui-install/hand.png 0644 root sys
-f none usr/share/gui-install/help/C/FINISH_PANEL.txt=usr/share/gui-install/FINISH_PANEL.txt 0644 root sys
-f none usr/share/gui-install/help/C/INSTALL_DISK_PANEL.txt=usr/share/gui-install/INSTALL_DISK_PANEL.txt 0644 root sys
-f none usr/share/gui-install/help/C/INSTALL_FAILURE_PANEL.txt=usr/share/gui-install/INSTALL_FAILURE_PANEL.txt 0644 root sys
-f none usr/share/gui-install/help/C/INSTALL_LANGUAGE_PANEL.txt=usr/share/gui-install/INSTALL_LANGUAGE_PANEL.txt 0644 root sys
-f none usr/share/gui-install/help/C/INSTALL_PROGRESS_PANEL.txt=usr/share/gui-install/INSTALL_PROGRESS_PANEL.txt 0644 root sys
-f none usr/share/gui-install/help/C/INSTALL_REVIEW_PANEL.txt=usr/share/gui-install/INSTALL_REVIEW_PANEL.txt 0644 root sys
-f none usr/share/gui-install/help/C/INSTALL_TIMEZONE_PANEL.txt=usr/share/gui-install/INSTALL_TIMEZONE_PANEL.txt 0644 root sys
-f none usr/share/gui-install/help/C/INSTALL_USERS_PANEL.txt=usr/share/gui-install/INSTALL_USERS_PANEL.txt 0644 root sys
-f none usr/share/gui-install/help/C/UPGRADE_DISK_PANEL.txt=usr/share/gui-install/UPGRADE_DISK_PANEL.txt 0644 root sys
-f none usr/share/gui-install/help/C/UPGRADE_FAILURE_PANEL.txt=usr/share/gui-install/UPGRADE_FAILURE_PANEL.txt 0644 root sys
-f none usr/share/gui-install/help/C/UPGRADE_PROGRESS_PANEL.txt=usr/share/gui-install/UPGRADE_PROGRESS_PANEL.txt 0644 root sys
-f none usr/share/gui-install/help/C/UPGRADE_REVIEW_PANEL.txt=usr/share/gui-install/UPGRADE_REVIEW_PANEL.txt 0644 root sys
-f none usr/share/gui-install/help/C/WELCOME_PANEL.txt=usr/share/gui-install/WELCOME_PANEL.txt 0644 root sys
+f none usr/share/gui-install/help/C/FINISH_PANEL.txt 0644 root sys
+f none usr/share/gui-install/help/C/INSTALL_DISK_PANEL.txt 0644 root sys
+f none usr/share/gui-install/help/C/INSTALL_FAILURE_PANEL.txt 0644 root sys
+f none usr/share/gui-install/help/C/INSTALL_LANGUAGE_PANEL.txt 0644 root sys
+f none usr/share/gui-install/help/C/INSTALL_PROGRESS_PANEL.txt 0644 root sys
+f none usr/share/gui-install/help/C/INSTALL_REVIEW_PANEL.txt 0644 root sys
+f none usr/share/gui-install/help/C/INSTALL_TIMEZONE_PANEL.txt 0644 root sys
+f none usr/share/gui-install/help/C/INSTALL_USERS_PANEL.txt 0644 root sys
+f none usr/share/gui-install/help/C/UPGRADE_DISK_PANEL.txt 0644 root sys
+f none usr/share/gui-install/help/C/UPGRADE_FAILURE_PANEL.txt 0644 root sys
+f none usr/share/gui-install/help/C/UPGRADE_PROGRESS_PANEL.txt 0644 root sys
+f none usr/share/gui-install/help/C/UPGRADE_REVIEW_PANEL.txt 0644 root sys
+f none usr/share/gui-install/help/C/WELCOME_PANEL.txt 0644 root sys
f none usr/share/gui-install/installation.glade 0644 root sys
f none usr/share/gui-install/installationdisk.glade 0644 root sys
-f none usr/share/gui-install/installmessages/install-01.png=usr/share/gui-install/install-01.png 0644 root sys
-f none usr/share/gui-install/installmessages/install-02.png=usr/share/gui-install/install-02.png 0644 root sys
-f none usr/share/gui-install/installmessages/install-03.png=usr/share/gui-install/install-03.png 0644 root sys
-f none usr/share/gui-install/installmessages/install-04.png=usr/share/gui-install/install-04.png 0644 root sys
-f none usr/share/gui-install/installmessages/install-05.png=usr/share/gui-install/install-05.png 0644 root sys
+f none usr/share/gui-install/installmessages/install-01.png 0644 root sys
+f none usr/share/gui-install/installmessages/install-02.png 0644 root sys
+f none usr/share/gui-install/installmessages/install-03.png 0644 root sys
+f none usr/share/gui-install/installmessages/install-04.png 0644 root sys
+f none usr/share/gui-install/installmessages/install-05.png 0644 root sys
f none usr/share/gui-install/magnifier.png 0644 root sys
f none usr/share/gui-install/solaris_logo.png 0644 root sys
f none usr/share/gui-install/sun_curve_hacky2.png 0644 root sys
--- a/usr/src/pkgdefs/SUNWslim-utils/prototype_com Fri May 21 08:53:04 2010 -0600
+++ b/usr/src/pkgdefs/SUNWslim-utils/prototype_com Mon May 24 17:31:06 2010 -0400
@@ -21,7 +21,6 @@
#
# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#
# This required package information file contains a list of package contents.
# The 'pkgmk' command uses this file to identify the contents of a package
# and their location on the development machine when building the package.
@@ -43,10 +42,10 @@
f none sbin/listcd 555 root bin
d none jack 755 jack staff
f none jack/xorg.conf.vesa 644 jack staff
-f none jack/.xscreensaver=jack/xscreensaver 644 jack staff
-f none jack/.Xclients=jack/Xclients 755 jack staff
-f none jack/.bashrc=jack/local.bashrc 755 jack staff
-f none jack/.profile=jack/local.profile 755 jack staff
+f none jack/.xscreensaver 644 jack staff
+f none jack/.Xclients 755 jack staff
+f none jack/.bashrc 755 jack staff
+f none jack/.profile 755 jack staff
d none jack/.config 755 jack staff
d none jack/.config/autostart 755 jack staff
f none jack/.config/autostart/iotrace.desktop 644 jack staff
--- a/usr/src/pkgdefs/SUNWtext-install/prototype_com Fri May 21 08:53:04 2010 -0600
+++ b/usr/src/pkgdefs/SUNWtext-install/prototype_com Mon May 24 17:31:06 2010 -0400
@@ -19,8 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
#
@@ -131,20 +130,20 @@
d none usr/share/text-install 0755 root sys
d none usr/share/text-install/help 0755 root sys
d none usr/share/text-install/help/C 0755 root sys
-f none usr/share/text-install/help/C/date_time.txt=usr/share/text-install/date_time.txt 0644 root sys
-f none usr/share/text-install/help/C/disks.txt=usr/share/text-install/disks.txt 0644 root sys
-f none usr/share/text-install/help/C/network.txt=usr/share/text-install/network.txt 0644 root sys
-f none usr/share/text-install/help/C/network_manual.txt=usr/share/text-install/network_manual.txt 0644 root sys
-f none usr/share/text-install/help/C/sparc_solaris_slices.txt=usr/share/text-install/sparc_solaris_slices.txt 0644 root sys
-f none usr/share/text-install/help/C/sparc_solaris_slices_select.txt=usr/share/text-install/sparc_solaris_slices_select.txt 0644 root sys
-f none usr/share/text-install/help/C/summary.txt=usr/share/text-install/summary.txt 0644 root sys
-f none usr/share/text-install/help/C/timezone.txt=usr/share/text-install/timezone.txt 0644 root sys
-f none usr/share/text-install/help/C/users.txt=usr/share/text-install/users.txt 0644 root sys
-f none usr/share/text-install/help/C/welcome.txt=usr/share/text-install/welcome.txt 0644 root sys
-f none usr/share/text-install/help/C/x86_fdisk_partitions.txt=usr/share/text-install/x86_fdisk_partitions.txt 0644 root sys
-f none usr/share/text-install/help/C/x86_fdisk_partitions_select.txt=usr/share/text-install/x86_fdisk_partitions_select.txt 0644 root sys
-f none usr/share/text-install/help/C/x86_fdisk_slices.txt=usr/share/text-install/x86_fdisk_slices.txt 0644 root sys
-f none usr/share/text-install/help/C/x86_fdisk_slices_select.txt=usr/share/text-install/x86_fdisk_slices_select.txt 0644 root sys
+f none usr/share/text-install/help/C/date_time.txt 0644 root sys
+f none usr/share/text-install/help/C/disks.txt 0644 root sys
+f none usr/share/text-install/help/C/network.txt 0644 root sys
+f none usr/share/text-install/help/C/network_manual.txt 0644 root sys
+f none usr/share/text-install/help/C/sparc_solaris_slices.txt 0644 root sys
+f none usr/share/text-install/help/C/sparc_solaris_slices_select.txt 0644 root sys
+f none usr/share/text-install/help/C/summary.txt 0644 root sys
+f none usr/share/text-install/help/C/timezone.txt 0644 root sys
+f none usr/share/text-install/help/C/users.txt 0644 root sys
+f none usr/share/text-install/help/C/welcome.txt 0644 root sys
+f none usr/share/text-install/help/C/x86_fdisk_partitions.txt 0644 root sys
+f none usr/share/text-install/help/C/x86_fdisk_partitions_select.txt 0644 root sys
+f none usr/share/text-install/help/C/x86_fdisk_slices.txt 0644 root sys
+f none usr/share/text-install/help/C/x86_fdisk_slices_select.txt 0644 root sys
d none var 0755 root sys
d none var/svc 0755 root sys
d none var/svc/manifest 0755 root sys
