I know the gate is currently closed, and that this stuff is not really supported. But until it gets a bit more lovin', my experience has been that this patch is quite helpful in terms of merge performance.
I've tested it by building merged osnet repos. Webrev at http://cr.opensolaris.org/~mjnelson/webrev.12800/ and patch attached to this note. --Mark
# HG changeset patch # User Mark J. Nelson <[email protected]> # Date 1258752266 25200 # Node ID 6c9716a250db4492819f9240d127fe248a23e416 # Parent b987b1a759cb94479611da3e9f5b2f3d1afc2422 12800 src/util/publish should use index control api diff --git a/src/util/publish/Makefile b/src/util/publish/Makefile --- a/src/util/publish/Makefile +++ b/src/util/publish/Makefile @@ -44,8 +44,11 @@ PYTHONPATH=$(PYTHONPATH) ./merge.py $(EXTRA_ARGS) -r -d $(MERGEDIR) -v sparc,$(SPARC_REPO) -v i386,$(i386_REPO) arch $(JUST_THESE_PKGS) publish: $(MERGEDIR) - for var in `(cd $(MERGEDIR); echo * )` ;\ - do PYTHONPATH=$(PYTHONPATH) ./pkg_publish $(MERGEDIR)/$$var $(REPO); done + for var in `(cd $(MERGEDIR); echo * )` ; do \ + PYTHONPATH=$(PYTHONPATH) \ + ./pkg_publish $(MERGEDIR)/$$var $(REPO); \ + done ; \ + pkgsend -s $(REPO) refresh-index clean: diff --git a/src/util/publish/pkg_publish b/src/util/publish/pkg_publish --- a/src/util/publish/pkg_publish +++ b/src/util/publish/pkg_publish @@ -9,6 +9,4 @@ fmri=`cat $dir/fmri` eval `pkgsend -s $repo open $fmri` pkgsend -s $repo include -d $dir $dir/manifest -pkgsend -s $repo close - - +pkgsend -s $repo close --no-index
_______________________________________________ pkg-discuss mailing list [email protected] http://mail.opensolaris.org/mailman/listinfo/pkg-discuss
