equal
deleted
inserted
replaced
104 GLOBAL_CHATTRS_123 = $(GLOBAL_CHATTRS_106) |
104 GLOBAL_CHATTRS_123 = $(GLOBAL_CHATTRS_106) |
105 GLOBAL_CHATTRS_124 = $(GLOBAL_CHATTRS_106) attrs |
105 GLOBAL_CHATTRS_124 = $(GLOBAL_CHATTRS_106) attrs |
106 GLOBAL_CHATTRS_125 = $(GLOBAL_CHATTRS_124) |
106 GLOBAL_CHATTRS_125 = $(GLOBAL_CHATTRS_124) |
107 GLOBAL_CHATTRS_126 = $(GLOBAL_CHATTRS_124) |
107 GLOBAL_CHATTRS_126 = $(GLOBAL_CHATTRS_124) |
108 GLOBAL_CHATTRS_127 = $(GLOBAL_CHATTRS_124) |
108 GLOBAL_CHATTRS_127 = $(GLOBAL_CHATTRS_124) |
|
109 GLOBAL_CHATTRS_128 = $(GLOBAL_CHATTRS_124) |
109 GLOBAL_CHATTRS = $(GLOBAL_CHATTRS_$(BUILDID)) |
110 GLOBAL_CHATTRS = $(GLOBAL_CHATTRS_$(BUILDID)) |
110 |
111 |
111 SOLARIS.PY=PYTHONPATH=$(PROTO_AREA)/usr/lib/python2.4/vendor-packages \ |
112 SOLARIS.PY=PYTHONPATH=$(PROTO_AREA)/usr/lib/python2.4/vendor-packages \ |
112 ./importer.py -b 0.$(BUILDID) $(EXTRA_OPTIONS) -T \*.py \ |
113 ./importer.py -b 0.$(BUILDID) $(EXTRA_OPTIONS) -T \*.py \ |
113 $(GLOBAL_CHATTRS:%= -G %) $(ARCH_DEFINES:%= -m %) \ |
114 $(GLOBAL_CHATTRS:%= -G %) $(ARCH_DEFINES:%= -m %) \ |
164 ELIDED_FILES_123 = $(ELIDED_FILES_106) |
165 ELIDED_FILES_123 = $(ELIDED_FILES_106) |
165 ELIDED_FILES_124 = $(ELIDED_FILES_BASE) |
166 ELIDED_FILES_124 = $(ELIDED_FILES_BASE) |
166 ELIDED_FILES_125 = $(ELIDED_FILES_BASE) |
167 ELIDED_FILES_125 = $(ELIDED_FILES_BASE) |
167 ELIDED_FILES_126 = $(ELIDED_FILES_BASE) |
168 ELIDED_FILES_126 = $(ELIDED_FILES_BASE) |
168 ELIDED_FILES_127 = $(ELIDED_FILES_BASE) |
169 ELIDED_FILES_127 = $(ELIDED_FILES_BASE) |
|
170 ELIDED_FILES_128 = $(ELIDED_FILES_BASE) |
169 ELIDED_FILES = $(ELIDED_FILES_$(BUILDID)) |
171 ELIDED_FILES = $(ELIDED_FILES_$(BUILDID)) |
170 |
172 |
171 # |
173 # |
172 # these files get placed into proto area from per-build cached versions |
174 # these files get placed into proto area from per-build cached versions |
173 # |
175 # |
244 CACHED_FILES_123 = |
246 CACHED_FILES_123 = |
245 CACHED_FILES_124 = |
247 CACHED_FILES_124 = |
246 CACHED_FILES_125 = |
248 CACHED_FILES_125 = |
247 CACHED_FILES_126 = |
249 CACHED_FILES_126 = |
248 CACHED_FILES_127 = |
250 CACHED_FILES_127 = |
|
251 CACHED_FILES_128 = |
249 |
252 |
250 CACHED_FILES = $(CACHED_FILES_$(BUILDID)) |
253 CACHED_FILES = $(CACHED_FILES_$(BUILDID)) |
251 |
254 |
252 FIX_FILES_BASE = \ |
255 FIX_FILES_BASE = \ |
253 $(CACHED_FILES) \ |
256 $(CACHED_FILES) \ |
339 shadow \ |
342 shadow \ |
340 shares.desktop \ |
343 shares.desktop \ |
341 vi |
344 vi |
342 FIX_FILES_126 = $(FIX_FILES_125) |
345 FIX_FILES_126 = $(FIX_FILES_125) |
343 FIX_FILES_127 = $(FIX_FILES_125) |
346 FIX_FILES_127 = $(FIX_FILES_125) |
|
347 FIX_FILES_128 = $(FIX_FILES_125) |
344 FIX_FILES = $(FIX_FILES_$(BUILDID)) |
348 FIX_FILES = $(FIX_FILES_$(BUILDID)) |
345 |
349 |
346 JDKFILES = LICENSE README.html |
350 JDKFILES = LICENSE README.html |
347 JREFILES = LICENSE README |
351 JREFILES = LICENSE README |
348 |
352 |
410 122 \ |
414 122 \ |
411 123 \ |
415 123 \ |
412 124 \ |
416 124 \ |
413 125 \ |
417 125 \ |
414 126 \ |
418 126 \ |
415 127 |
419 127 \ |
|
420 128 |
416 |
421 |
417 # |
422 # |
418 # Starting in build 80, filelist.ramdisk began moving between various |
423 # Starting in build 80, filelist.ramdisk began moving between various |
419 # packages. |
424 # packages. |
420 # |
425 # |
423 FILELIST_RAMDISK_PKG_75a = SUNWcakr.i |
428 FILELIST_RAMDISK_PKG_75a = SUNWcakr.i |
424 FILELIST_RAMDISK_PKG_74 = SUNWcakr.i |
429 FILELIST_RAMDISK_PKG_74 = SUNWcakr.i |
425 FILELIST_RAMDISK_PKG_72 = SUNWcakr.i |
430 FILELIST_RAMDISK_PKG_72 = SUNWcakr.i |
426 FILELIST_RAMDISK_PKG_71 = SUNWcakr.i |
431 FILELIST_RAMDISK_PKG_71 = SUNWcakr.i |
427 |
432 |
428 default: 127/slim_import |
433 default: 128/slim_import |
429 |
434 |
430 cluster.import: $(WOS_PKGS)/.clustertoc Makefile |
435 cluster.import: $(WOS_PKGS)/.clustertoc Makefile |
431 ./clustertoc2import.py $(WOS_PKGS)/.clustertoc | \ |
436 ./clustertoc2import.py $(WOS_PKGS)/.clustertoc | \ |
432 sed "s/version 2.2.1a/version 2.2.1.1/" > $@ |
437 sed "s/version 2.2.1a/version 2.2.1.1/" > $@ |
433 |
438 |
604 INCLUDE_PATH_123 = 123:$(INCLUDE_PATH_122) |
609 INCLUDE_PATH_123 = 123:$(INCLUDE_PATH_122) |
605 INCLUDE_PATH_124 = 124:$(INCLUDE_PATH_123) |
610 INCLUDE_PATH_124 = 124:$(INCLUDE_PATH_123) |
606 INCLUDE_PATH_125 = 125:$(INCLUDE_PATH_124) |
611 INCLUDE_PATH_125 = 125:$(INCLUDE_PATH_124) |
607 INCLUDE_PATH_126 = 126:$(INCLUDE_PATH_125) |
612 INCLUDE_PATH_126 = 126:$(INCLUDE_PATH_125) |
608 INCLUDE_PATH_127 = 127:$(INCLUDE_PATH_126) |
613 INCLUDE_PATH_127 = 127:$(INCLUDE_PATH_126) |
|
614 INCLUDE_PATH_128 = 128:$(INCLUDE_PATH_127) |
609 |
615 |
610 import: cluster.import $(FIX_FILES:%=$(BUILDID)/%) |
616 import: cluster.import $(FIX_FILES:%=$(BUILDID)/%) |
611 $(SOLARIS.PY) -s $(REPO) -w $(WOS_PKGS) $(ELIDED_FILES:%=-D %) \ |
617 $(SOLARIS.PY) -s $(REPO) -w $(WOS_PKGS) $(ELIDED_FILES:%=-D %) \ |
612 $(INCLUDE_PATH_$(BUILDID):%=-I %) $(BUILDID)/all.i386 |
618 $(INCLUDE_PATH_$(BUILDID):%=-I %) $(BUILDID)/all.i386 |
613 |
619 |