From ff17ebb2ff55678e48b0bcfcc29254e45530243b Mon Sep 17 00:00:00 2001 From: Danek Duvall <danek.duvall@oracle.com> Date: Wed, 11 Aug 2010 18:18:07 +0200 Subject: [PATCH] Removed $(PUBLISHER) from pkg.fmri package attributes. Renamed package manifests to .p5m. Made setup.py-based components install to vendor-packages instead of site-packages. --- make-rules/ips.mk | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/make-rules/ips.mk b/make-rules/ips.mk index 6ecba0a..04cfd8a 100644 --- a/make-rules/ips.mk +++ b/make-rules/ips.mk @@ -82,13 +82,13 @@ MANIFEST_BASE = $(COMPONENT_SRC)/manifest-$(MACH) -CANONICAL_MANIFESTS = $(wildcard *.ips) +CANONICAL_MANIFESTS = $(wildcard *.p5m) GENERATED = $(MANIFEST_BASE)-generated COMBINED = $(MANIFEST_BASE)-combined MANIFESTS = $(CANONICAL_MANIFESTS:%=$(MANIFEST_BASE)-%) -MOGRIFIED=$(CANONICAL_MANIFESTS:%.ips=$(MANIFEST_BASE)-%.resolved) +MOGRIFIED=$(CANONICAL_MANIFESTS:%.p5m=$(MANIFEST_BASE)-%.resolved) PUBLISHED=$(MOGRIFIED:%.resolved=%.published) COPYRIGHT_FILE = $(COMPONENT_NAME)-$(COMPONENT_VERSION).copyright @@ -103,7 +103,7 @@ publish: install $(COMPONENT_SRC)/.published -sample-manifest: $(GENERATED).ips +sample-manifest: $(GENERATED).p5m # # Rules for generating a manifest automatically. Generated manifests will @@ -136,7 +136,7 @@ $(PKGDEPEND) resolve -o $< | sed -e '1d' >$@ # generate a complete manifest from the pieces -$(GENERATED).ips: $(GENERATED).metadata $(GENERATED).actions \ +$(GENERATED).p5m: $(GENERATED).metadata $(GENERATED).actions \ $(GENERATED).depend cat $(COPYRIGHT_TEMPLATE) $(GENERATED).metadata $(GENERATED).actions \ $(GENERATED).depend >$@ @@ -148,11 +148,11 @@ # Combine the canonical manifest(s) for this component and "normalize" them # for comparison. -$(COMBINED).ips: canonical-manifests +$(COMBINED).p5m: canonical-manifests cat $(CANONICAL_MANIFESTS) | $(PKGMOGRIFY) $(PKG_OPTIONS) /dev/fd/0 | \ sed -e '/^$$/d' -e '/^#.*$$/d' | sort -u | $(PKGFMT) >$@ -$(MANIFEST_BASE)-%.compare: $(MANIFEST_BASE)-%.ips +$(MANIFEST_BASE)-%.compare: $(MANIFEST_BASE)-%.p5m $(PKGMOGRIFY) $(PKG_OPTIONS) $(COMPARISON_TRANSFORMS) $< >$@ manifest-compare: $(COMBINED).compare $(GENERATED).compare @@ -161,7 +161,7 @@ # mogrify the canonical manifest(s) # -$(MANIFEST_BASE)-%.resolved: %.ips manifest-compare +$(MANIFEST_BASE)-%.resolved: %.p5m manifest-compare $(PKGMOGRIFY) $(PKG_OPTIONS) $< $(PUBLISH_TRANSFORMS) >$@ $(MANIFEST_BASE)-%.published: $(MANIFEST_BASE)-%.resolved -- Gitblit v1.9.3