7075220 sc_template.xml left behind in cleanup
7061155 Need to fix Makefile.master to SPRO_VROOT due to nightly change in 7060181
--- a/usr/src/Makefile Tue Aug 09 03:24:30 2011 -0700
+++ b/usr/src/Makefile Tue Aug 09 11:37:55 2011 -0400
@@ -137,3 +137,11 @@
java-version:
@$(ECHO) Java compiler; \
$(ECHO) Java not used in this build
+
+#
+# Target for reporting compiler path; nightly uses this to find dmake
+#
+
+spro-vroot:
+ @$(ECHO) $(SPRO_VROOT)
+
--- a/usr/src/Makefile.master Tue Aug 09 03:24:30 2011 -0700
+++ b/usr/src/Makefile.master Tue Aug 09 11:37:55 2011 -0400
@@ -43,7 +43,7 @@
BUILD_TOOLS= /opt
ONBLD_TOOLS= $(BUILD_TOOLS)/onbld
SPRO_ROOT= $(BUILD_TOOLS)/SUNWspro
-SPRO_VROOT= $(SPRO_ROOT)
+SPRO_VROOT= $(SPRO_ROOT)/sunstudio12.1
LINT= $(SPRO_VROOT)/bin/lint
CC= $(SPRO_VROOT)/bin/cc
--- a/usr/src/README Tue Aug 09 03:24:30 2011 -0700
+++ b/usr/src/README Tue Aug 09 11:37:55 2011 -0400
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2007, 2011 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
#
@@ -31,14 +31,21 @@
-------------------------------------------------------
NOTE: The following steps require the user to have sufficient privileges,
via pfexec or sudo, to install software on the build system.
- 1. Get the SunStudio compilers via the Image Packaging System (IPS). To install
- run the command "pkg install developer/sunstudio12u1"
- * Alternatively, the package "pkg:/developer/solaris-studio-express" may
- be used. However, Solaris Studio 12 update 1 is the currently
- supported build environment.
+ 1. Get the SunStudio compilers. There are two choices:
+ a) Mount/symlink or rsync cache the /ws/onnv-tools autofs. This is
+ highly recommended for Oracle internal developers. The compilers
+ are found at /ws/onnv-tools/SUNWspro/sunstudio12.1 (which is a
+ symlink to the specific patched version used).
+ b) Via the Image Packaging System (IPS). To install, run the command
+ "pkg install developer/sunstudio12u1". This package may not
+ be identical to the onnv-tools version, so is not preferred.
+
+ Alternatively, the package "pkg:/developer/solaris-studio-express"
+ may be used. However, Solaris Studio 12 update 1 is the currently
+ supported build environment.
2. Get the OS/Net Build Tools via the Image Packaging System (IPS). To install
- run the command "pkg install developer/build/onbld"
+ run the command "pkg install developer/build/onbld".
3. Install required IPS packages:
@@ -60,14 +67,15 @@
2. cp tools/env/developer.sh .; chmod +w developer.sh
Some environment variables which might need to be changed:
- *You should - set the path to your repository defined by CODEMGR_WS.
- *You may - need to change the SPRO_ROOT variable to point to your
- installed compilers. Likely locations are:
- /opt/sunstudio12.1 (default)
- /opt/solstudioex
- /opt/SUNWspro
+ * You should set the path to your repository defined by CODEMGR_WS.
+ * You may need to change the SPRO_ROOT variable to point to your
+ installed compilers. Likely locations are:
+ /opt/SUNWspro (default)
+ /opt
+ /ws/onnv-tools
- You might want to link SUNWspro to sunstudio12.1 if necessary
+ In some circumstances overriding the SPRO_VROOT variable may be useful,
+ as well as symlinks from /opt to your compiler location.
To build this repository use the following steps:
-------------------------------------------------
--- a/usr/src/lib/install_ict/Makefile Tue Aug 09 03:24:30 2011 -0700
+++ b/usr/src/lib/install_ict/Makefile Tue Aug 09 11:37:55 2011 -0400
@@ -29,23 +29,18 @@
cleanup_cpio_install.py \
create_snapshot.py \
device_config.py \
- generate_sc_profile.py \
initialize_smf.py \
ips.py \
setup_swap.py \
transfer_files.py \
update_dumpadm.py
-PROFILESRC= sc_template.xml
-
PYCMODS = $(PYMODS:%.py=%.pyc)
ROOTPYMODS= $(PYMODS:%=$(ROOTPYTHONVENDORSOLINSTALLICT)/%)
ROOTPYCMODS= $(PYCMODS:%=$(ROOTPYTHONVENDORSOLINSTALLICT)/%)
-PROFILES= $(PROFILESRC:%=$(ROOTUSRSHAREINSTALL)/%)
-
CLOBBERFILES = $(PYCMODS)
CLEANFILES = $(CLOBBERFILES)
@@ -73,8 +68,7 @@
$(ROOTPYTHONVENDORSOLINSTALL) \
$(ROOTPYTHONVENDORSOLINSTALLICT) \
$(ROOTPYMODS) \
- $(ROOTPYCMODS) \
- $(ROOTUSRSHAREINSTALL) $(PROFILES)
+ $(ROOTPYCMODS)
lint: lint_SRCS
--- a/usr/src/lib/install_ict/__init__.py Tue Aug 09 03:24:30 2011 -0700
+++ b/usr/src/lib/install_ict/__init__.py Tue Aug 09 11:37:55 2011 -0400
@@ -27,9 +27,8 @@
'''Python package for icts'''
__all__ = ["apply_sysconfig", "boot_archive", "cleanup_cpio_install",
- "common", "create_snapshot", "device_config",
- "generate_sc_profile", "initialize_smf",
- "ips", "setup_swap", "transfer_files", "update_dumpadm"]
+ "common", "create_snapshot", "device_config", "initialize_smf",
+ "ips", "setup_swap", "transfer_files", "update_dumpadm"]
from solaris_install.engine import InstallEngine
from solaris_install.engine.checkpoint import AbstractCheckpoint
@@ -58,7 +57,6 @@
PROFILE_SITE = 'etc/svc/profile/site.xml'
REPO_DB = 'etc/svc/repository.db'
SC_PROFILE = 'etc/svc/profile/sc_profile.xml'
-SC_TEMPLATE = 'usr/share/install/sc_template.xml'
SVCCFG = '/usr/sbin/svccfg'
SVCCFG_DTD = 'SVCCFG_DTD'
SVCCFG_REPOSITORY = 'SVCCFG_REPOSITORY'
--- a/usr/src/lib/install_ict/generate_sc_profile.py Tue Aug 09 03:24:30 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,172 +0,0 @@
-#!/usr/bin/python
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
-#
-
-import array
-import fcntl
-import solaris_install.ict as ICT
-import os
-import shutil
-
-from solaris_install.data_object.data_dict import DataObjectDict
-
-
-class GenerateSCProfile(ICT.ICTBaseClass):
- '''ICT checkpoint assembles a system configuration profile'''
- def __init__(self, name):
- '''Initializes the class
- Parameters:
- -name - this arg is required by the AbstractCheckpoint
- and is not used by the checkpoint.
- '''
- super(GenerateSCProfile, self).__init__(name)
-
- # Set the default system configuration template used to assemble
- # system configuration profile
- self.sc_template = ICT.SC_TEMPLATE
-
- # Set the default system configuration profile target
- self.target_sc_profile = ICT.SC_PROFILE
-
- # Set the keyboard parameters used to get the keyboard layout
- self.kbd_device = ICT.KBD_DEV
- self.kbd_layout_file = ICT.KBD_LAYOUT_FILE
- self.keyboard_layout = ''
-
- def _get_keyboard_layout(self):
- '''Gets the keyboard layout for the system'''
-
- # Obtain ioctl codes taken from /usr/include/sys/kbio.h
- kioc = ord('k') << 8
- kioclayout = kioc | 20
-
- with open(self.kbd_device, "r") as fhndl:
- kbd_array = array.array('i', [0])
- # Get the requested keyboard layout
- fcntl.ioctl(fhndl, kioclayout, kbd_array, 1)
- # Convert the output to a list
- kbd_layout = kbd_array.tolist()[0]
-
- # Set the keyboard_layout parameter to the requested layout
- kbd_layout_name = ''
- with open(self.kbd_layout_file, "r") as fhndl:
- # Read the file until keyboard layout number matches
- # what has been requested.
- for line in fhndl:
- if line.startswith('#') or '=' not in line:
- continue
- (kbd_layout_name, num) = line.split('=')
- if int(num) == kbd_layout:
- keyboard_layout = kbd_layout_name
- break
-
- if keyboard_layout == '':
- self.logger.debug('Keyboard layout has not been identified')
- self.logger.debug('It will be configured to', ICT.KBD_DEFAULT)
- keyboard_layout = ICT.KBD_DEFAULT
- else:
- self.logger.debug('Detected [%s] keyboard layout '
- % keyboard_layout)
- return keyboard_layout
-
- def execute(self, dry_run=False):
- '''
- The AbstractCheckpoint class requires this method
- in sub-classes.
-
- Take template SMF profile, set value of keymap/layout SMF property
- to the requested value. If no value is requested, the default is
- configured as 'US-English' in the template. Store the SMF profile
- into the profile directory, /etc/svc/profile.
-
- Parameters:
- - the dry_run keyword paramater. The default value is False.
- If set to True, the log message describes the checkpoint tasks.
-
- Returns:
- - Nothing
- On failure, errors raised are managed by the engine.
- '''
-
- # The optional configuration source and destination
- sc_profile_src = None
- sc_profile_dst = None
-
- self.logger.debug('ICT current task: generating the system '
- 'configuration profile')
-
- # parse_doc populates variables necessary to execute the checkpoint
- self.parse_doc()
-
- # Perform a check to see if a configuration source or destination
- # has been provided in the DOC
- # Get the checkpoint info from the DOC
- gen_sc_dict = self.doc.persistent.get_descendants(name=self.name,
- class_type=DataObjectDict)
-
- # Check that there is not more than one entry for sc configuration
- if gen_sc_dict:
- if len(gen_sc_dict) > 1:
- raise ValueError("Only one value for a system configuration "
- "profile node can be specified with name ",
- self.name)
-
- # If there is a configuration entry, replace the default target
- # profile or source with the one provided in the DOC
- for sc_dict in gen_sc_dict:
- if len(sc_dict.data_dict) > 1:
- raise ValueError("Only one source and destination may "
- "be specified")
-
- for source, dest in sc_dict.data_dict.items():
- if self.sc_template != source:
- self.sc_template = source
- if self.target_sc_profile != dest:
- self.target_sc_profile = dest
-
- sc_profile_src = os.path.join(self.target_dir,
- self.sc_template)
- sc_profile_dst = os.path.join(self.target_dir,
- self.target_sc_profile)
-
- # Get the keyboard layout for the system
- self.keyboard_layout = self._get_keyboard_layout()
-
- if not dry_run:
- # copy the source data base to the destination data base
- if not os.path.exists(os.path.dirname(sc_profile_dst)):
- os.makedirs(os.path.dirname(sc_profile_dst))
-
- if self.keyboard_layout == ICT.KBD_DEFAULT:
- shutil.copy2(sc_profile_src, sc_profile_dst)
- else:
- with open(sc_profile_dst, "w+")as dst_hndl:
- with open(sc_profile_src, "r+") as fhndl:
- for line in fhndl:
- if ICT.KBD_DEFAULT in line and \
- self.keyboard_layout != ICT.KBD_DEFAULT:
- line = line.replace(ICT.KBD_DEFAULT,
- self.keyboard_layout)
- dst_hndl.write(line)
--- a/usr/src/lib/install_ict/sc_template.xml Tue Aug 09 03:24:30 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-<?xml version='1.0'?>
-<!--
- CDDL HEADER START
-
- The contents of this file are subject to the terms of the
- Common Development and Distribution License (the "License").
- You may not use this file except in compliance with the License.
-
- You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- or http://www.opensolaris.org/os/licensing.
- See the License for the specific language governing permissions
- and limitations under the License.
-
- When distributing Covered Code, include this CDDL HEADER in each
- file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- If applicable, add the following below this CDDL HEADER, with the
- fields enclosed by brackets "[]" replaced with your own identifying
- information: Portions Copyright [yyyy] [name of copyright owner]
-
- CDDL HEADER END
-
- Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
-
--->
-
-<!--
- This file contains template of System Configuration profile. This template
- is used by GUI installer to assemble System Configuration profile
- which during first boot of installed system configures SMF properties of
- SMF services responsible for particular system configuration area.
--->
-
-<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-
-<service_bundle type='profile' name='sc_gui_install'>
-
-<!--
- Parameter: timezone
- SMF service: svc:/system/timezone:default
- SMF property: timezone/localtime
--->
-
- <service name='system/timezone' version='1'>
- <instance name='default'>
- <property_group name='timezone'>
- <propval name='localtime' value='UTC' />
- </property_group>
- </instance>
- </service>
-
-<!--
- Parameter: keyboard layout
- SMF service: svc:/system/keymap:default
- SMF property: keymap/layout
--->
-
- <service name='system/keymap' version='1'>
- <instance name='default'>
- <property_group name='keymap'>
- <propval name='layout' value='US-English' />
- </property_group>
- </instance>
- </service>
-
-<!--
- Parameter: choose nwam to handle network configuration on installed system
- SMF service: svc:/network/physical
--->
-
- <service name='network/physical' version='1'>
- <instance name='default' enabled='false'/>
- <instance name='nwam' enabled='true'/>
- </service>
-</service_bundle>
--- a/usr/src/lib/install_ict/test/test_gen_sc_profile.py Tue Aug 09 03:24:30 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,282 +0,0 @@
-#!/usr/bin/python
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
-#
-'''
- test_gen_sc_profile
- Test program for testing GenerateSCProfile
-'''
-
-import os
-import shutil
-import tempfile
-import unittest
-
-from common_create_simple_doc import CreateSimpleDataObjectCache
-from solaris_install.data_object.data_dict import DataObjectDict
-from solaris_install.ict import SC_TEMPLATE
-from solaris_install.ict.generate_sc_profile import GenerateSCProfile
-from solaris_install.engine.test.engine_test_utils import reset_engine
-
-
-class TestGenerateSCProfile(unittest.TestCase):
- '''test the functionality for GenerateSCProfile Class'''
-
- def setUp(self):
-
- # Set up the Target directory
- self.test_target = tempfile.mkdtemp(dir="/tmp",
- prefix="ict_test_")
- os.chmod(self.test_target, 0777)
-
- self.sc_test_template = ['<!DOCTYPE service_bundle SYSTEM \
- "/usr/share/lib/xml/dtd/service_bundle.dts.1">',
- ' ',
- '<!--',
- 'Parameter: keyboard layout',
- 'SMF service: svc:/system/keymap:default',
- 'SMF property: keymap/layout',
- '-->',
- '<service_bundle type="profile" \
- name="sc_install_interactive">',
- ' <service name="system/keymap" version="1"\
- type="system">',
- ' <instance name="default">',
- ' <property_group name="keymap" \
- type="system">',
- ' <propval name="layout" \
- type="astring" \
- value="US-English" />',
- ' </property_group>',
- ' </instance>',
- ' </service>',
- '</service_bundle>']
-
- self.sc_test_template_it = ['<!DOCTYPE service_bundle SYSTEM \
- "/usr/share/lib/xml/dtd/service_bundle.dts.1">',
- ' ',
- '<!--',
- 'Parameter: keyboard layout',
- 'SMF service: svc:/system/keymap:default',
- 'SMF property: keymap/layout',
- '-->',
- '<service_bundle type="profile" \
- name="sc_install_interactive">',
- ' <service name="system/keymap" version="1"\
- type="system">',
- ' <instance name="default">',
- ' <property_group name="keymap" \
- type="system">',
- ' <propval name="layout" \
- type="astring" \
- value="Italian" />',
- ' </property_group>',
- ' </instance>',
- ' </service>',
- '</service_bundle>']
-
- # Create a data object to hold the required data
- self.simple = CreateSimpleDataObjectCache(test_target=self.test_target)
- self.sc_dict = {}
-
- def tearDown(self):
- reset_engine()
- self.simple.doc = None
-
- if os.path.exists(self.test_target):
- shutil.rmtree(self.test_target)
- self.sc_dict = {}
-
- def test_sc_profile_config_default(self):
- '''Test the default parameters of GenerateSCProfile'''
-
- # Create the test source directory
- test_source = os.path.join(self.test_target,
- 'usr/share/install/sc_template.xml')
- if not os.path.exists(os.path.dirname(test_source)):
- os.makedirs(os.path.dirname(test_source))
-
- # Create the test sc_template.xml file
- sc_tmp_string = ''
- for sc_tmplt in self.sc_test_template:
- sc_tmp_string += sc_tmplt + '\n'
- with open(test_source, "w") as fh:
- fh.writelines(sc_tmp_string)
- fh.close()
-
- # Instantiate the checkpoint
- gen_sc = GenerateSCProfile("generate_sc_profile")
-
- try:
- gen_sc.execute()
- except Exception as e:
- self.fail(str(e))
-
- def test_sc_profile_config_dif(self):
- '''Test different kb parameters of GenerateSCProfile'''
-
- # Create the test source directory
- test_source = os.path.join(self.test_target,
- 'usr/share/install/sc_template.xml')
- if not os.path.exists(os.path.dirname(test_source)):
- os.makedirs(os.path.dirname(test_source))
-
- # Create the test sc_template.xml file
- sc_tmp_string = ''
- for sc_tmplt in self.sc_test_template_it:
- sc_tmp_string += sc_tmplt + '\n'
- with open(test_source, "w") as fh:
- fh.writelines(sc_tmp_string)
- fh.close()
-
- # Instantiate the checkpoint
- gen_sc = GenerateSCProfile("generate_sc_profile")
-
- try:
- gen_sc.execute()
- except Exception as e:
- self.fail(str(e))
-
- def test_sc_profile_different_dest(self):
- '''Test different sc_profile destination succeeds'''
-
- self.sc_dict[SC_TEMPLATE] = 'test_dir/my_sc_template.xml'
-
- sc_dod = DataObjectDict("generate_sc_profile", self.sc_dict,
- generate_xml=True)
- self.simple.doc.persistent.insert_children([sc_dod])
-
- # Create the test source directory
- test_source = os.path.join(self.test_target,
- 'usr/share/install/sc_template.xml')
- if not os.path.exists(os.path.dirname(test_source)):
- os.makedirs(os.path.dirname(test_source))
-
- # Create the test sc_template.xml file
- sc_tmp_string = ''
- for sc_tmplt in self.sc_test_template:
- sc_tmp_string += sc_tmplt + '\n'
- with open(test_source, "w") as fh:
- fh.writelines(sc_tmp_string)
- fh.close()
-
- # Instantiate the checkpoint
- gen_sc = GenerateSCProfile("generate_sc_profile")
-
- try:
- gen_sc.execute()
- except Exception as e:
- self.fail(str(e))
-
- def test_more_than_one_profile_node(self):
- '''Test having multiple configurations fails'''
- sc_dict2 = {}
-
- sc_dict2[SC_TEMPLATE] = 'test_dir/my_sc_template.xml'
- sc_dod = DataObjectDict("generate_sc_profile", sc_dict2,
- generate_xml=True)
- self.simple.doc.persistent.insert_children([sc_dod])
-
- self.sc_dict[SC_TEMPLATE] = 'test_dir/my_sc_template.xml'
- sc_dod_2 = DataObjectDict("generate_sc_profile", self.sc_dict,
- generate_xml=True)
- self.simple.doc.persistent.insert_children([sc_dod_2])
-
- # Instantiate the checkpoint
- gen_sc = GenerateSCProfile("generate_sc_profile")
- self.assertRaises(ValueError, gen_sc.execute, dry_run=True)
-
- def test_gen_sc_profile_dry(self):
- '''Test GenerateSCProfile dry run'''
-
- gen_sc = GenerateSCProfile("generate_sc_profile")
- # Call the execute command for the checkpoint
- # with dry_run set to true.
- try:
- gen_sc.execute(dry_run=True)
- except Exception as e:
- self.fail(str(e))
-
- def test_gen_sc_profile_src_dest(self):
- '''Test passing in a source and a destination'''
- alt_source = 'usr/share/install/sc2_template.xml'
- test_source = os.path.join(self.test_target, alt_source)
- if not os.path.exists(os.path.dirname(test_source)):
- os.makedirs(os.path.dirname(test_source))
-
- # Create the test sc_template.xml file
- sc_tmp_string = ''
- for sc_tmplt in self.sc_test_template:
- sc_tmp_string += sc_tmplt + '\n'
- with open(test_source, "w") as fh:
- fh.writelines(sc_tmp_string)
- fh.close()
-
- self.sc_dict[alt_source] = 'test_dir/my_sc_template.xml'
- sc_dod = DataObjectDict("generate_sc_profile", self.sc_dict,
- generate_xml=True)
- self.simple.doc.persistent.insert_children([sc_dod])
-
- gen_sc = GenerateSCProfile("generate_sc_profile")
- try:
- gen_sc.execute()
- except Exception as e:
- self.fail(str(e))
-
- def test_gen_sc_profile_default_src(self):
- '''Use the default source and a user defined destination'''
-
- # Create the test source directory
- test_source = os.path.join(self.test_target, SC_TEMPLATE)
- if not os.path.exists(os.path.dirname(test_source)):
- os.makedirs(os.path.dirname(test_source))
-
- # Create the test sc_template.xml file
- sc_tmp_string = ''
- for sc_tmplt in self.sc_test_template:
- sc_tmp_string += sc_tmplt + '\n'
- with open(test_source, "w") as fh:
- fh.writelines(sc_tmp_string)
- fh.close()
-
- self.sc_dict[SC_TEMPLATE] = 'test_dir/mysc_template.xml'
- sc_dod = DataObjectDict("generate_sc_profile", self.sc_dict,
- generate_xml=True)
- self.simple.doc.persistent.insert_children([sc_dod])
-
- gen_sc = GenerateSCProfile("generate_sc_profile")
- try:
- gen_sc.execute()
- except Exception as e:
- self.fail(str(e))
-
- def test_get_progress_estimate(self):
- '''Test get progress estimate return value'''
-
- gen_sc = GenerateSCProfile("generate_sc_profile")
- # Check the return value for the progress estimate
- self.assertEquals(gen_sc.get_progress_estimate(), 1)
-
-if __name__ == '__main__':
- unittest.main()
--- a/usr/src/pkg/manifests/system-install.mf Tue Aug 09 03:24:30 2011 -0700
+++ b/usr/src/pkg/manifests/system-install.mf Tue Aug 09 11:37:55 2011 -0400
@@ -36,7 +36,6 @@
dir path=usr/lib/python2.6/vendor-packages/osol_install
dir path=usr/lib/python2.6/vendor-packages/terminalui
dir path=usr/share group=sys
-dir path=usr/share/install 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
@@ -99,7 +98,6 @@
mode=0444
file path=usr/lib/python2.6/vendor-packages/terminalui/window_area.pyc \
mode=0444
-file path=usr/share/install/sc_template.xml group=sys mode=0444
license cr_Sun license=cr_Sun
depend fmri=library/python-2/python-extra-26 type=require
--- a/usr/src/pkg/manifests/system-library-install.mf Tue Aug 09 03:24:30 2011 -0700
+++ b/usr/src/pkg/manifests/system-library-install.mf Tue Aug 09 11:37:55 2011 -0400
@@ -199,10 +199,6 @@
file \
path=usr/lib/python2.6/vendor-packages/solaris_install/ict/device_config.pyc
file \
- path=usr/lib/python2.6/vendor-packages/solaris_install/ict/generate_sc_profile.py
-file \
- path=usr/lib/python2.6/vendor-packages/solaris_install/ict/generate_sc_profile.pyc
-file \
path=usr/lib/python2.6/vendor-packages/solaris_install/ict/initialize_smf.py
file \
path=usr/lib/python2.6/vendor-packages/solaris_install/ict/initialize_smf.pyc
--- a/usr/src/tools/env/developer.sh Tue Aug 09 03:24:30 2011 -0700
+++ b/usr/src/tools/env/developer.sh Tue Aug 09 11:37:55 2011 -0400
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2007, 2010 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
#
# Configuration variables for the runtime environment of the nightly
@@ -150,9 +150,7 @@
#
#BUILD_TOOLS=/opt; export BUILD_TOOLS
#ONBLD_TOOLS=/opt/onbld; export ONBLD_TOOLS
-SPRO_ROOT=/opt/sunstudio12.1; export SPRO_ROOT
-
-
+#SPRO_ROOT=/opt/SUNWspro; export SPRO_ROOT
# This goes along with lint - it is a series of the form "A [y|n]" which
# means "go to directory A and run 'make lint'" Then mail me (y) the