--- a/src/util/distro-import/Makefile Fri Apr 22 13:02:43 2011 +1200
+++ b/src/util/distro-import/Makefile Thu Apr 21 21:59:31 2011 -0700
@@ -187,6 +187,7 @@
CONSOLIDATION_OPTIONS_162 = $(CONSOLIDATION_OPTIONS_155)
CONSOLIDATION_OPTIONS_163 = $(CONSOLIDATION_OPTIONS_155) \
$(DESKTOP_CONSOLIDATION_OPTIONS)
+CONSOLIDATION_OPTIONS_164 = $(CONSOLIDATION_OPTIONS_163)
CONSOLIDATION_OPTIONS = $(CONSOLIDATION_OPTIONS_$(BUILDID))
GLOBAL_CHATTRS_BASE= \
@@ -267,6 +268,7 @@
GLOBAL_CHATTRS_161 = $(GLOBAL_CHATTRS_124)
GLOBAL_CHATTRS_162 = $(GLOBAL_CHATTRS_124)
GLOBAL_CHATTRS_163 = $(GLOBAL_CHATTRS_124)
+GLOBAL_CHATTRS_164 = $(GLOBAL_CHATTRS_124)
GLOBAL_CHATTRS = $(GLOBAL_CHATTRS_$(BUILDID))
SOLARIS.PY=PYTHONPATH=$(PROTO_AREA)/usr/lib/python2.6/vendor-packages \
@@ -366,6 +368,7 @@
ELIDED_FILES_161 = $(ELIDED_FILES_BASE)
ELIDED_FILES_162 = $(ELIDED_FILES_BASE)
ELIDED_FILES_163 = $(ELIDED_FILES_BASE)
+ELIDED_FILES_164 = $(ELIDED_FILES_BASE)
ELIDED_FILES = $(ELIDED_FILES_$(BUILDID))
#
@@ -485,6 +488,7 @@
CACHED_FILES_161 =
CACHED_FILES_162 =
CACHED_FILES_163 =
+CACHED_FILES_164 =
CACHED_FILES = $(CACHED_FILES_$(BUILDID))
FIX_FILES_BASE = \
@@ -631,6 +635,7 @@
FIX_FILES_161 =
FIX_FILES_162 =
FIX_FILES_163 =
+FIX_FILES_164 =
FIX_FILES = $(FIX_FILES_$(BUILDID))
JDKFILES = LICENSE README.html
@@ -742,7 +747,8 @@
160 \
161 \
162 \
- 163
+ 163 \
+ 164
#
# Starting in build 80, filelist.ramdisk began moving between various
@@ -755,7 +761,7 @@
FILELIST_RAMDISK_PKG_72 = SUNWcakr.i
FILELIST_RAMDISK_PKG_71 = SUNWcakr.i
-default: 163/redist_import
+default: 164/redist_import
cluster.import: $(WOS_PKGS)/.clustertoc Makefile
./clustertoc2import.py $(WOS_PKGS)/.clustertoc | \
@@ -987,6 +993,7 @@
INCLUDE_PATH_161 = 161:$(INCLUDE_PATH_160)
INCLUDE_PATH_162 = 162:$(INCLUDE_PATH_161)
INCLUDE_PATH_163 = 163:$(INCLUDE_PATH_162)
+INCLUDE_PATH_164 = 164:$(INCLUDE_PATH_163)
import: cluster.import $(FIX_FILES:%=$(BUILDID)/%)
$(SOLARIS.PY) -s $(REPO) -w $(WOS_PKGS) $(ELIDED_FILES:%=-D %) \