Print this page
pkg: If the adjunct proto is a package image, use it for dependency resolution
@@ -248,14 +248,20 @@
SYNTH_PKGS= osnet-incorporation osnet-redist
DEP_SYNTH_PKGS= $(SYNTH_PKGS:%=$(PDIR)/%.dep)
PROC_SYNTH_PKGS= $(SYNTH_PKGS:%=$(PDIR)/%.mog)
#
-# Root of pkg image to use for dependency resolution
-# Normally / on the machine used to build the binaries
+# Root of pkg image to use for dependency resolution Normally / on the machine
+# used to build the binaries, or the ADJUNCT_PROTO
#
-PKGDEP_RESOLVE_IMAGE = /
+PKG_ADJUNCT.cmd= if [[ -d $${ADJUNCT_PROTO}/var/pkg ]]; then \
+ echo $$ADJUNCT_PROTO; \
+ else \
+ echo /; \
+ fi
+
+PKGDEP_RESOLVE_IMAGE = $(PKG_ADJUNCT.cmd:sh)
#
# For each package, we determine the target repository based on
# manifest-embedded metadata. Because we make that determination on
# the fly, the publication target cannot be expressed as a