--- a/oi-releng-distro-import	Tue Apr 05 00:17:15 2011 +0100
+++ b/oi-releng-distro-import	Tue Apr 05 00:43:39 2011 +0100
@@ -10,23 +10,38 @@
  WOS_PKGS=$(WOS_PKGS_BASE)/$(ARCH)
  WOS_EXTRA_PKGS=$(WOS_PKGS_BASE)/all
  NONWOS_DOCK=nv_osoldev
-@@ -43,34 +43,18 @@
+@@ -43,49 +43,33 @@
              /net/paradise.sfbay/export/integrate_dock/nv/$(NONWOS_DOCK)/$(ARCH)
  
  TEST_PKGS=
 -REPO=http://localhost:10000
--ON_REPO=http://localhost:20000
--INSTALL_REPO=http://localhost:20001
--X_REPO=http://localhost:20002
--IPS_REPO=http://localhost:20003
--VPANELS_REPO=http://localhost:20004
 +REPO=file:///net/infra01/export/releng/oi/oi_$(BUILDID)/repo
 +REPO_DOCK=file:///net/infra01/export/integrate_dock/oi/oi_$(BUILDID)
+ 
+-ON_REPO=http://localhost:20000
 +ON_REPO=$(REPO_DOCK)/onnv_$(BUILDID)/$(ARCH)/nightly-nd/repo.redist
+ ON_BUILDID=$(BUILDID)
+ ON_INCORPORATION=consolidation/osnet/[email protected].$(ON_BUILDID)
+ 
+-INSTALL_REPO=http://localhost:20001
 +INSTALL_REPO=$(REPO_DOCK)/slim_source_$(BUILDID)/$(ARCH)/nightly-nd/repo.redist
+ INSTALL_BUILDID=$(BUILDID)
+ INSTALL_INCORPORATION=consolidation/install/[email protected].$(INSTALL_BUILDID)
+ 
+-X_REPO=http://localhost:20002
 +X_REPO=$(REPO_DOCK)/xnv_$(BUILDID)/pkg_$(ARCH)
+ X_BUILDID=$(BUILDID)
+ X_INCORPORATION=consolidation/X/[email protected].$(X_BUILDID)
+ 
+-IPS_REPO=http://localhost:20003
 +IPS_REPO=$(REPO_DOCK)/pkg_$(BUILDID)/$(ARCH)/repo
+ IPS_BUILDID=$(BUILDID)
+ IPS_INCORPORATION=consolidation/ips/[email protected].$(IPS_BUILDID)
+ 
+-VPANELS_REPO=http://localhost:20004
 +VPANELS_REPO=$(REPO_DOCK)/vpanels_$(BUILDID)/$(ARCH)/repo
+ VPANELS_BUILDID=$(BUILDID)
+ VPANELS_INCORPORATION=consolidation/vpanels/[email protected].$(VPANELS_BUILDID)
  
  BUILDID_NORESPIN=/usr/bin/echo $(BUILDID) | sed -e 's/\([0-9]\)[a-z]*$$/\1/g'
  
@@ -57,26 +72,33 @@
 diff --git a/src/util/publish/Makefile b/src/util/publish/Makefile
 --- a/src/util/publish/Makefile
 +++ b/src/util/publish/Makefile
-@@ -24,12 +24,13 @@
+@@ -24,7 +24,8 @@
  #
  
  ARCH:sh=	uname -p
 -REPO=http://localhost:10000
++REPO=file:///net/infra01/export/releng/oi/oi_$(BUILDID)/repo
++REPO_DOCK=file:///net/infra01/export/integrate_dock/oi/oi_$(BUILDID)
+ MERGEDIR=../../../proto/merge
+ SETPUBLISHERDIR=../../../proto/set-publisher
+ PROTO=../../../proto/root_$(ARCH)
+@@ -34,11 +35,11 @@
+ EXTRA_ARGS=
+ JUST_THESE_PKGS=
+ 
 -ON_REPO=http://localhost:20000
 -INSTALL_REPO=http://localhost:20001
 -X_REPO=http://localhost:20002
 -IPS_REPO=http://localhost:20003
 -VPANELS_REPO=http://localhost:20004
-+REPO=file:///net/infra01/export/releng/oi/oi_$(BUILDID)/repo
-+REPO_DOCK=file:///net/infra01/export/integrate_dock/oi/oi_$(BUILDID)
 +ON_REPO=$(REPO_DOCK)/onnv_$(BUILDID)/$(ARCH)/nightly-nd/repo.redist
 +INSTALL_REPO=$(REPO_DOCK)/slim_source_$(BUILDID)/$(ARCH)/nightly-nd/repo.redist
 +X_REPO=$(REPO_DOCK)/xnv_$(BUILDID)/pkg_$(ARCH)
 +IPS_REPO=$(REPO_DOCK)/pkg_$(BUILDID)/$(ARCH)/repo
 +VPANELS_REPO=$(REPO_DOCK)/vpanels_$(BUILDID)/$(ARCH)/repo
- MERGEDIR=../../../proto/merge
- SETPUBLISHERDIR=../../../proto/set-publisher
- PROTO=../../../proto/root_$(ARCH)
+ 
+ INPUT_REPOS = \
+     $(ON_REPO) \
 diff --git a/src/util/publish/set-publisher.transforms b/src/util/publish/set-publisher.transforms
 --- a/src/util/publish/set-publisher.transforms
 +++ b/src/util/publish/set-publisher.transforms