7066258 slim_source usr/src/README need to be updated
7066106 usr/src/lib/install_common/test/test_install_common.py unit test failure due to missing module
--- a/usr/src/README Tue Jul 12 11:36:32 2011 -0700
+++ b/usr/src/README Tue Jul 12 17:54:39 2011 -0700
@@ -42,8 +42,10 @@
3. Install required IPS packages:
+ developer/build/dmake
developer/swig
system/boot/wanboot/internal
+ system/header
system/library/install/libinstzones
system/library/libdiskmgt/header-libdiskmgt
system/zones/internal
@@ -65,6 +67,8 @@
/opt/solstudioex
/opt/SUNWspro
+ You might want to link SUNWspro to sunstudio12.1 if necessary
+
To build this repository use the following steps:
-------------------------------------------------
1. cd usr/src in the repository
--- a/usr/src/cmd/auto-install/utmpx.py Tue Jul 12 11:36:32 2011 -0700
+++ b/usr/src/cmd/auto-install/utmpx.py Tue Jul 12 17:54:39 2011 -0700
@@ -67,18 +67,18 @@
};
"""
_fields_ = [
- ("ut_user", C.c_char * 32),
- ("ut_id", C.c_char * 4),
- ("ut_line", C.c_char * 32),
- ("ut_pid", C.c_uint),
- ("ut_type", C.c_short),
- ("ut_exit", C.c_short * 2), # Shouldn't need it, so no need for
- # struct here just yet.
- ("ut_tv", C.c_long * 2), # or here either.
- ("ut_session", C.c_int),
- ("pad", C.c_int * 5),
- ("ut_syslen", C.c_short),
- ("ut_host", C.c_char * 257)
+ ("ut_user", C.c_char * 32),
+ ("ut_id", C.c_char * 4),
+ ("ut_line", C.c_char * 32),
+ ("ut_pid", C.c_uint),
+ ("ut_type", C.c_short),
+ ("ut_exit", C.c_short * 2), # Shouldn't need it, so no need for
+ # struct here just yet.
+ ("ut_tv", C.c_long * 2), # or here either.
+ ("ut_session", C.c_int),
+ ("pad", C.c_int * 5),
+ ("ut_syslen", C.c_short),
+ ("ut_host", C.c_char * 257)
]
_FUNCS = [
--- a/usr/src/lib/install_configuration/__init__.py Tue Jul 12 11:36:32 2011 -0700
+++ b/usr/src/lib/install_configuration/__init__.py Tue Jul 12 17:54:39 2011 -0700
@@ -33,4 +33,3 @@
# Register the DOC classes
DataObjectCache.register_class(Configuration)
-
--- a/usr/src/lib/install_configuration/configuration.py Tue Jul 12 11:36:32 2011 -0700
+++ b/usr/src/lib/install_configuration/configuration.py Tue Jul 12 17:54:39 2011 -0700
@@ -139,7 +139,6 @@
"Unable to open source (%s): %s" % \
(source, e))
-
for subelement in element.iterchildren():
if subelement.tag == cls.VALIDATION_LABEL:
path = subelement.get(cls.PATH_LABEL)
--- a/usr/src/lib/install_manifest/writer/writer.py Tue Jul 12 11:36:32 2011 -0700
+++ b/usr/src/lib/install_manifest/writer/writer.py Tue Jul 12 17:54:39 2011 -0700
@@ -145,7 +145,6 @@
raise ManifestError("DTD [%s] is not a file" % dtd_file)
self._dtd_file = dtd_file
-
def get_progress_estimate(self):
'''
The parent class requires that this method be implemented
@@ -157,7 +156,6 @@
return 1
-
def write(self, doc):
'''
This API method is not part of the AbstractCheckpoint spec.
@@ -258,7 +256,6 @@
if manifest_file is not None:
manifest_file.close()
-
def execute(self, dry_run=False):
'''
Abstract method defined in AbstractCheckpoint class.
@@ -308,7 +305,7 @@
prefix, suffix = os.path.splitext(filename)
file_desc, new_filename = \
- tempfile.mkstemp(suffix=suffix, prefix=prefix+"_", dir=dirname)
+ tempfile.mkstemp(suffix=suffix, prefix=prefix + "_", dir=dirname)
try:
os.close(file_desc)
--- a/usr/src/lib/install_utils/install_utils.py Tue Jul 12 11:36:32 2011 -0700
+++ b/usr/src/lib/install_utils/install_utils.py Tue Jul 12 17:54:39 2011 -0700
@@ -194,7 +194,7 @@
if (len(word) != 0):
outlist.append(word.strip())
word = ""
-
+
# Escaped double quote
elif (next_state == __QST_DQT):
if (squoteon):
@@ -329,7 +329,7 @@
not specified, it will default to DEBUG
stderr_log_level: Logging level for the stderr of each command. If
not specified, it will default to ERROR
- discard_stdout: If set to True, discard stdout
+ discard_stdout: If set to True, discard stdout
Returns:
The return value of the command executed.
@@ -341,7 +341,7 @@
if (stdout_log_level is None):
stdout_log_level = DEBUG
-
+
if (stderr_log_level is None):
stderr_log_level = ERROR
@@ -361,7 +361,7 @@
log_msg = "exec command: " + string.join(cmd)
if len(log_msg) > 200:
- log_msg += "\n"
+ log_msg += "\n"
if log is not None:
log.log(stdout_log_level, log_msg)
@@ -579,6 +579,7 @@
rlist.append(fullname)
return rlist
+
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
def file_size(filename):
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -616,6 +617,7 @@
else:
return (((stat.st_size / 1024) + 1) * 1024)
+
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
def dir_size(rootpath):
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -683,8 +685,8 @@
plaintext: password string in plaintext
salt: salt to be used for the encryption. If none is provided,
a salt will be generated.
- alt_root: alternate root to find the libc.so that contains the libraries
- to be called for generating the seed.
+ alt_root: alternate root to find the libc.so that contains the
+ libraries to be called for generating the seed.
username: name of the user to generate the password for.
Returns:
@@ -750,6 +752,7 @@
else:
return inspect.getargspec(func.__call__)
+
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
def set_http_proxy(proxy):
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--- a/usr/src/tools/tests/README Tue Jul 12 11:36:32 2011 -0700
+++ b/usr/src/tools/tests/README Tue Jul 12 17:54:39 2011 -0700
@@ -25,8 +25,9 @@
for the slim_source gate. In order to run the tests you should:
1) Install Nose and the coverage module:
- * Installing the Python setup tools:
+ * Installing the Python setup tools and runtime/python-26/tests
pkg install library/python-2/setuptools-26
+ pkg install runtime/python-26/tests
* Running the command:
easy_install-2.6 nose coverage
(The warning messages during installation may be ignored)