--- a/src/util/distro-import/Makefile Fri Feb 11 13:52:24 2011 +1300
+++ b/src/util/distro-import/Makefile Thu Feb 10 18:21:54 2011 -0800
@@ -131,6 +131,10 @@
USERLAND_CONSOLIDATION_OPTIONS = \
-C userland \
-R $(USERLAND_REPO)@SUNWa2ps \
+ -R $(USERLAND_REPO)@SUNWbzip \
+ -R $(USERLAND_REPO)@SUNWgmake \
+ -R $(USERLAND_REPO)@compress/bzip2 \
+ -R $(USERLAND_REPO)@developer/build/gnu-make \
-R $(USERLAND_REPO)@print/lp/filter/a2ps
L10N_CONSOLIDATION_OPTIONS = \
@@ -169,6 +173,7 @@
CONSOLIDATION_OPTIONS_156 = $(CONSOLIDATION_OPTIONS_155)
CONSOLIDATION_OPTIONS_157 = $(CONSOLIDATION_OPTIONS_155)
CONSOLIDATION_OPTIONS_158 = $(CONSOLIDATION_OPTIONS_155)
+CONSOLIDATION_OPTIONS_159 = $(CONSOLIDATION_OPTIONS_155)
CONSOLIDATION_OPTIONS = $(CONSOLIDATION_OPTIONS_$(BUILDID))
GLOBAL_CHATTRS_BASE= \
@@ -244,6 +249,7 @@
GLOBAL_CHATTRS_156 = $(GLOBAL_CHATTRS_124)
GLOBAL_CHATTRS_157 = $(GLOBAL_CHATTRS_124)
GLOBAL_CHATTRS_158 = $(GLOBAL_CHATTRS_124)
+GLOBAL_CHATTRS_159 = $(GLOBAL_CHATTRS_124)
GLOBAL_CHATTRS = $(GLOBAL_CHATTRS_$(BUILDID))
SOLARIS.PY=PYTHONPATH=$(PROTO_AREA)/usr/lib/python2.6/vendor-packages \
@@ -338,6 +344,7 @@
ELIDED_FILES_156 = $(ELIDED_FILES_BASE)
ELIDED_FILES_157 = $(ELIDED_FILES_BASE)
ELIDED_FILES_158 = $(ELIDED_FILES_BASE)
+ELIDED_FILES_159 = $(ELIDED_FILES_BASE)
ELIDED_FILES = $(ELIDED_FILES_$(BUILDID))
#
@@ -452,6 +459,7 @@
CACHED_FILES_156 =
CACHED_FILES_157 =
CACHED_FILES_158 =
+CACHED_FILES_159 =
CACHED_FILES = $(CACHED_FILES_$(BUILDID))
FIX_FILES_BASE = \
@@ -593,6 +601,7 @@
FIX_FILES_156 =
FIX_FILES_157 =
FIX_FILES_158 =
+FIX_FILES_159 =
FIX_FILES = $(FIX_FILES_$(BUILDID))
JDKFILES = LICENSE README.html
@@ -699,7 +708,8 @@
155 \
156 \
157 \
- 158
+ 158 \
+ 159
#
# Starting in build 80, filelist.ramdisk began moving between various
@@ -712,7 +722,7 @@
FILELIST_RAMDISK_PKG_72 = SUNWcakr.i
FILELIST_RAMDISK_PKG_71 = SUNWcakr.i
-default: 158/redist_import
+default: 159/redist_import
cluster.import: $(WOS_PKGS)/.clustertoc Makefile
./clustertoc2import.py $(WOS_PKGS)/.clustertoc | \
@@ -939,6 +949,7 @@
INCLUDE_PATH_156 = 156:$(INCLUDE_PATH_155)
INCLUDE_PATH_157 = 157:$(INCLUDE_PATH_156)
INCLUDE_PATH_158 = 158:$(INCLUDE_PATH_157)
+INCLUDE_PATH_159 = 159:$(INCLUDE_PATH_158)
import: cluster.import $(FIX_FILES:%=$(BUILDID)/%)
$(SOLARIS.PY) -s $(REPO) -w $(WOS_PKGS) $(ELIDED_FILES:%=-D %) \