Mercurial Mercurial > illumos-userland / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Used "mangled" manifests instead of "depended": depended is useless for dpkg based system and can fail on "#!/usr/bin/env python" (e. g. python-babal)
authorIgor Pashev <igor.pashev@nexenta.com>
Wed, 26 Oct 2011 16:51:40 +0400
changeset 468 ba6c4262c8df
parent 467 7409853656b6
child 469 d39d97f5335c
Used "mangled" manifests instead of "depended": depended is useless for dpkg based system and can fail on "#!/usr/bin/env python" (e. g. python-babal)
make-rules/deb.mk file | annotate | diff | comparison | revisions
make-rules/ips.mk file | annotate | diff | comparison | revisions 
--- a/make-rules/deb.mk	Wed Oct 26 15:32:52 2011 +0400
+++ b/make-rules/deb.mk	Wed Oct 26 16:51:40 2011 +0400
@@ -12,9 +12,8 @@
 # and debs (like debian/pkg-name)
 DEBS_DIR = $(PROTO_DIR)/debs
 
-# Actually we need $(RESOLVED),
 # but pkgdepend resolve does not work:
-deb: build install $(DEPENDED)
+deb: build install $(MANGLED)
 	rm -rf $(DEBS_DIR)
 	$(MKDIR) $(DEBS_DIR)
 	$(DEBMAKER) \
@@ -22,6 +21,6 @@
 		-N $(CONSOLIDATION) \
 		-V $(DEBVERSION) \
 		-D $(DEBS_DIR) \
-		$(PROTO_DIRS) $(DEPENDED)
+		$(PROTO_DIRS) $(MANGLED)
 
 
--- a/make-rules/ips.mk	Wed Oct 26 15:32:52 2011 +0400
+++ b/make-rules/ips.mk	Wed Oct 26 16:51:40 2011 +0400
@@ -94,6 +94,7 @@
 
 DEPENDED=$(CANONICAL_MANIFESTS:%.p5m=$(MANIFEST_BASE)-%.depend)
 RESOLVED=$(CANONICAL_MANIFESTS:%.p5m=$(MANIFEST_BASE)-%.depend.res)
+MANGLED=$(CANONICAL_MANIFESTS:%.p5m=$(MANIFEST_BASE)-%.mangled)
 PUBLISHED=$(RESOLVED:%.depend.res=%.published)
 PKGINSTALLED=$(PUBLISHED:%.published=%.installed)
illumos-userland