--- a/src/util/distro-import/Makefile	Sat Sep 03 04:26:00 2011 +0000
+++ b/src/util/distro-import/Makefile	Sat Sep 03 04:26:00 2011 +0000
@@ -44,12 +44,11 @@
 
 TEST_PKGS=
 
-RELENG_ROOT=/net/infa01/export/integrate_dock/oi/oi_151a
+RELENG_ROOT=/net/infra01/export/integrate_dock/oi/oi_151a
 
-WOS_PKGS_BASE=$(RELENG_ROOT)/src-svr4-pkgs
+WOS_PKGS_BASE=$(RELENG_ROOT)/import
 WOS_PKGS= \
 	$(WOS_PKGS_BASE)/SunVTS_134b_import/$(ARCH) \
-	$(WOS_PKGS_BASE)/admin+sic_team_148/$(ARCH) \
 	$(WOS_PKGS_BASE)/admin_151a_import/$(ARCH) \
 	$(WOS_PKGS_BASE)/cacao_134b_import/$(ARCH) \
 	$(WOS_PKGS_BASE)/cde_134b_import/$(ARCH) \
@@ -60,53 +59,56 @@
 	$(WOS_PKGS_BASE)/jdmk_134b_import/all $(WOS_PKGS_BASE)/man_134b_import/$(ARCH) \
 	$(WOS_PKGS_BASE)/l10n_134b_import/$(ARCH) \
 	$(WOS_PKGS_BASE)/nspg_134b_import/$(ARCH) \
-	$(WOS_PKGS_BASE)/nvidia_151a_import/$(ARCH) \
 	$(WOS_PKGS_BASE)/xvm_151a_import/$(ARCH) \
 	\
-	$(WOS_PKGS_BASE)/solaris_re/all $(WOS_PKGS_BASE)/solaris_re/$(ARCH) \
-	$(WOS_PKGS_BASE)/jds/$(ARCH) \
-	$(WOS_PKGS_BASE)/mozilla-l10n \
-	$(WOS_PKGS_BASE)/sfw/$(ARCH)
+	$(RELENG_ROOT)/solaris_re/packages/all $(RELENG_ROOT)/solaris_re/packages/$(ARCH) \
+	$(RELENG_ROOT)/jds_151a/PKGS/ \
+	$(RELENG_ROOT)/turds_151a/ \
+	$(RELENG_ROOT)/mozilla-l10n_151a/PKGS \
+	$(RELENG_ROOT)/sfw_151a/$(ARCH)/nightly-nd
 
 
 REPO=file:///export/home/sustaining/richlowe-repo
 
-ON_REPO=file://$(RELENG_ROOT)/src-ips-repos/osnet/$(ARCH)/repo.redist
-ON_BUILDID=$(BUILDID)
+ON_REPO=file://$(RELENG_ROOT)/illumos_151a/$(ARCH)/nightly-nd/repo.redist
+ON_BUILDID=151.1
 ON_INCORPORATION=consolidation/osnet/[email protected].$(ON_BUILDID)
 
-INSTALL_REPO=file://$(RELENG_ROOT)/src-ips-repos/install/$(ARCH)/repo.redist
+INSTALL_REPO=file://$(RELENG_ROOT)/slim_source_151a/$(ARCH)/nightly-nd/repo.redist
 INSTALL_BUILDID=$(BUILDID)
 INSTALL_INCORPORATION=consolidation/install/[email protected].$(INSTALL_BUILDID)
 
-X_REPO=file://$(RELENG_ROOT)/src-ips-repos/X/pkg_$(ARCH)
+NVIDIA_REPO=file://$(RELENG_ROOT)/oi-build_151a/$(ARCH)/repo
+NVIDIA_BUILDID=$(BUILDID)
+NVIDIA_INCORPORATION=consolidation/nvidia/[email protected].$(NVIDIA_BUILDID)
+
+X_REPO=file://$(RELENG_ROOT)/xnv_151a/pkg_$(ARCH)
 X_BUILDID=$(BUILDID)
 X_INCORPORATION=consolidation/X/[email protected].$(X_BUILDID)
 
-IPS_REPO=file://$(RELENG_ROOT)/src-ips-repos/ips/$(ARCH)/repo
+IPS_REPO=file://$(RELENG_ROOT)/pkg_151a/pkg_$(ARCH)
 IPS_BUILDID=$(BUILDID)
 IPS_INCORPORATION=consolidation/ips/[email protected].$(IPS_BUILDID)
 
-VPANELS_REPO=file://$(RELENG_ROOT)/src-ips-repos/vpanels/$(ARCH)
+VPANELS_REPO=file://$(RELENG_ROOT)/vpanels_151a/$(ARCH)
 VPANELS_BUILDID=$(BUILDID)
 VPANELS_INCORPORATION=consolidation/vpanels/[email protected].$(VPANELS_BUILDID)
 
-L10N_REPO=file://$(RELENG_ROOT)/src-ips-repos/l10n/$(ARCH)/repo.redist
+L10N_REPO=file://$(RELENG_ROOT)/l10n_151a/$(ARCH)/repo.redist
 L10N_BUILDID=$(BUILDID)
 L10N_INCORPORATION=consolidation/l10n/[email protected].$(L10N_BUILDID)
 
-JAVA_REPO=file://$(RELENG_ROOT)/src-ips-repos/java/$(ARCH)
+JAVA_REPO=file://$(RELENG_ROOT)/ub_javavm_151a/$(ARCH)/repo
 JAVA_BUILDID=$(BUILDID)
 UB_JAVAVM_INCORPORATION=consolidation/ub_javavm/[email protected].$(JAVA_BUILDID)
-DBTG_INCORPORATION=consolidation/dbtg/[email protected].$(JAVA_BUILDID)
 
-SICTEAM_REPO=file://$(RELENG_ROOT)/src-ips-repos/sic_team/$(ARCH)
+SICTEAM_REPO=file://$(RELENG_ROOT)/sic_team_151a/$(ARCH)/repo
 SICTEAM_BUILDID=$(BUILDID)
 SICTEAM_INCORPORATION=consolidation/sic_team/[email protected].$(SICTEAM_BUILDID)
 
 BUILDID_NORESPIN=/usr/bin/echo $(BUILDID) | sed -e 's/\([0-9]\)[a-z]*$$/\1/g'
 
-REF_REPO=http://ipkg.sfbay/release
+REF_REPO=http://localhost:9003/
 REF_URIS=$(REF_REPO)@[email protected],5.11-0.$(BUILDID_NORESPIN:sh)
 
 JUST_THESE_PKGS=
@@ -144,6 +146,11 @@
 	-E $(ON_INCORPORATION) \
 	-J developer/build/onbld -J developer/opensolaris/osnet
 
+NVIDIA_CONSOLIDATION_OPTIONS= \
+	-C nvidia
+	-R $(NVIDIA_REPO)@$(NVIDIA_INCORPORATION) \
+	-E $(NVIDIA_INCORPORATION)
+
 INSTALL_CONSOLIDATION_OPTIONS = \
 	-C install \
 	-R $(INSTALL_REPO)@$(INSTALL_INCORPORATION) \
@@ -173,9 +180,9 @@
 	-C ub_javavm \
 	-C dbtg \
 	-R $(JAVA_REPO)@$(UB_JAVAVM_INCORPORATION) \
-	-R $(JAVA_REPO)@$(DBTG_INCORPORATION) \
+        -R $(JAVA_REPO)@$(DBTG_INCORPORATION) \
 	-E $(UB_JAVAVM_INCORPORATION) \
-	-E $(DBTG_INCORPORATION)
+        -E $(DBTG_INCORPORATION)
 
 SICTEAM_CONSOLIDATION_OPTIONS = \
 	-C sic_team \
@@ -205,7 +212,8 @@
 CONSOLIDATION_OPTIONS_150 = $(CONSOLIDATION_OPTIONS_148)
 CONSOLIDATION_OPTIONS_151 = $(CONSOLIDATION_OPTIONS_148) \
 	$(JAVA_CONSOLIDATION_OPTIONS) \
-	$(SICTEAM_CONSOLIDATION_OPTIONS)
+	$(SICTEAM_CONSOLIDATION_OPTIONS) \
+	$(NVIDIA_CONSOLIDATION_OPTIONS) \
 CONSOLIDATION_OPTIONS = $(CONSOLIDATION_OPTIONS_$(BUILDID))
 
 GLOBAL_CHATTRS_BASE=	\
@@ -938,7 +946,7 @@
 	$(MAKE) BUILDID=$(@:%/import=%) import
 
 redist_import:	$(BUILDID)/redist_cluster $(FIX_FILES:%=$(BUILDID)/%)
-	$(SOLARIS.PY) -s $(REPO) $(ALL_PKGS:%=-w %) $(ELIDED_FILES:%=-D %) \
+	$(SOLARIS.PY) -A -s $(REPO) $(ALL_PKGS:%=-w %) $(ELIDED_FILES:%=-D %) \
 		$(JUST_THESE_PKGS:%=-j %) $(INCLUDE_PATH_$(BUILDID):%=-I %) \
 		$(CONSOLIDATION_OPTIONS) $(BUILDID)/redist_cluster