Mercurial > illumos > wpa

changeset 13007:f69f91784e5c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6945225 need to remove workarounds for recently changed IPS behavior
author Mark J. Nelson <Mark.J.Nelson@Oracle.COM>
date Mon, 02 Aug 2010 16:33:53 -0600
parents 659c850dd2a2
children 85fa1f457f1a
files usr/src/pkg/Makefile
diffstat 1 files changed, 4 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/pkg/Makefile	Mon Aug 02 16:32:07 2010 -0600
+++ b/usr/src/pkg/Makefile	Mon Aug 02 16:33:53 2010 -0600
@@ -378,14 +378,6 @@
 #					| pkgdepend
 #					|
 #				processed manifests
-#
-# Due to limitations in pkgdepend, we cannot simply treat synthetic
-# and real manifests identically.  But we don't really want to
-# maintain a separate chain for synthetic manifests, so for the left
-# side of this diagram, we actually do faux dependency generation and
-# resolution, so we end up with the expected set of files in $(PDIR),
-# per the individual file chain described above: mf, mog, dep, res,
-# and pub files for each manifest.
 # 
 ALL_TARGETS= $(PROC_SYNTH_PKGS) proto_list_$(PKGMACH)
 
@@ -401,16 +393,10 @@
 
 #
 # This rule resolves dependencies across all published manifests.
-# We should be able to do this with
 #
-#    pkgdepend resolve -m $(PUB_PKGS:%.pub=%.dep)
-#
-# but until 14113 is fixed, the incorporations confuse pkgdepend, so we
-# just create the .res file for DEP_SYNTH_PKGS directly.
-#
-# We also shouldn't have to ignore the error from pkgdepend, but
-# until at least 14110 is resolved, pkgdepend will always exit with
-# an error.
+# We shouldn't have to ignore the error from pkgdepend, but until
+# 16012 and its dependencies are resolved, pkgdepend will always exit
+# with an error.
 #
 $(PDIR)/gendeps: $(DEP_SYNTH_PKGS) $(DEP_PKGS)
 	-$(PKGDEBUG)if [ "$(SUPPRESSPKGDEP)" = "true" ]; then \
@@ -420,7 +406,7 @@
 		done; \
 	else \
 		print "Resolving dependencies"; \
-		pkgdepend resolve -m $(DEP_PKGS); \
+		pkgdepend resolve -m $(DEP_SYNTH_PKGS) $(DEP_PKGS); \
 		for p in $(DEP_PKGS:%.dep=%); do \
 			if [ "$$(print $$p.metadata.*)" = \
 			     "$$(print $$p.metadata.noincorp.*)" ]; \
@@ -435,10 +421,6 @@
 			fi; \
 		done; \
 	fi
-	$(PKGDEBUG)for p in $(DEP_SYNTH_PKGS:%.dep=%); \
-	do \
-		$(CP) $$p.dep $$p.res; \
-	done
 	$(PKGDEBUG)$(TOUCH) $(@)
 
 install: $(ALL_TARGETS) repository-metadata
@@ -448,7 +430,6 @@
 	$(PKGDEBUG)for r in $(REPOS); do \
 		/usr/lib/pkg.depotd -d $(PKGDEST)/repo.$$r \
 			--add-content --exit-ready; \
-		chmod a+r $(PKGDEST)/repo.$$r/cfg_cache; \
 	done
 
 #