Tim Foster wrote:
> Drew was running into this on an nv_136 system. I applied your suggested
> fix. It fails when we get to regenerating the search indices as we're
> still trying to call /usr/lib/pkg.depotd from the machine rather than
> the proto area.
That probably ought to be fixed by calling pkgrepo refresh. I'd avoided
doing that before because I didn't want pkrepo to be a requirement on the
system, but if I set PATH to the proto area, that takes care of that ...
Thanks for pointing that out.
diff --git a/src/Makefile b/src/Makefile
--- a/src/Makefile
+++ b/src/Makefile
@@ -60,8 +60,11 @@ install: $(SUBDIRS)
$(SUBDIRS): FRC
@cd $@; pwd; $(MAKE) $(TARGET)
+# Use the bits we just built to create the packages.
packages: install
- @cd pkg; pwd; $(MAKE) $(TARGET) check
+ @cd pkg; pwd; $(MAKE) $(TARGET) check \
+ PATH=$$(hg root)/proto/root_$$(uname -p)/usr/bin:$$PATH \
+ PYTHONPATH=$$(hg root)/proto/root_$$(uname
-p)/usr/lib/python2.6/vendor-packages
# XXX link is a developer target to connect the local machine to the
current
# repository's working copy's versions of the commands, modules, and
supporting
diff --git a/src/pkg/Makefile b/src/pkg/Makefile
--- a/src/pkg/Makefile
+++ b/src/pkg/Makefile
@@ -53,6 +53,7 @@ PKGS.cmd = print $(MANIFESTS:%.
PKGS = $(PKGS.cmd:sh)
PKGMOGRIFY = pkgmogrify
PKGSEND = pkgsend
+PKGREPO = pkgrepo
MOGRIFESTS = $(MANIFESTS:%.p5m=$(PDIR)/%.mog)
PUBLIFESTS = $(MANIFESTS:%.p5m=$(PDIR)/%.pub)
INCORP = consolidation%2Fips%2Fips-incorporation
@@ -85,14 +86,14 @@ svr4:
# Finalize the repository
repository-metadata: publish-pkgs
- /usr/lib/pkg.depotd -d $(PKGDEST)/repo --add-content --exit-ready
+ $(PKGREPO) -s $(PKGDEST)/repo refresh
publish-pkgs: $(PKGDEST)/repo .WAIT $(PUBLIFESTS)
# Initialize the repository
$(PKGDEST)/repo:
- mkdir -p $@
- $(PKGSEND) -s file://$@ create-repository --set-property
publisher.prefix=$(PKGPUBLISHER)
+ $(PKGREPO) create $@
+ $(PKGREPO) -s $@ set-property publisher/prefix=$(PKGPUBLISHER)
# Special rule for creating the incorporation. Note that the incorporation
# looks at all manifests, not just the ones listed in $(MANIFESTS). This
is
Danek
_______________________________________________
pkg-discuss mailing list
[email protected]
http://mail.opensolaris.org/mailman/listinfo/pkg-discuss
