Danek Duvall
2010-08-11 ff17ebb2ff55678e48b0bcfcc29254e45530243b
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.

--HG--
rename : components/bind/bind.ips => components/bind/bind.p5m
rename : components/file/file.ips => components/file/file.p5m
rename : components/lcms/lcms.ips => components/lcms/lcms.p5m
rename : components/pycups/pycups.ips => components/pycups/pycups.p5m
rename : components/rsync/rsync.ips => components/rsync/rsync.p5m
3 files modified
5 files renamed
44 ■■■■■ changed files
components/bind/bind.p5m 2 ●●● patch | view | raw | blame | history
components/file/file.p5m 2 ●●● patch | view | raw | blame | history
components/lcms/lcms.p5m 2 ●●● patch | view | raw | blame | history
components/pycups/pycups.p5m 12 ●●●● patch | view | raw | blame | history
components/rsync/rsync.p5m 2 ●●● patch | view | raw | blame | history
make-rules/ips.mk 14 ●●●● patch | view | raw | blame | history
make-rules/setup.py.mk 8 ●●●● patch | view | raw | blame | history
transforms/manifest-metadata-template 2 ●●● patch | view | raw | blame | history
components/bind/bind.p5m
File was renamed from components/bind/bind.ips
@@ -21,7 +21,7 @@
# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
    value=pkg:/$(PUBLISHER)/network/dns/bind@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
    value=pkg:/network/dns/bind@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.description value="$(COMPONENT_DESCRIPTION) "
set name=pkg.summary value="$(COMPONENT_SUMMARY) "
set name=info.classification \
components/file/file.p5m
File was renamed from components/file/file.ips
@@ -21,7 +21,7 @@
# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
    value=pkg:/$(PUBLISHER)/file/file@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
    value=pkg:/file/file@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.description value="$(COMPONENT_DESCRIPTION) "
set name=pkg.summary value="$(COMPONENT_SUMMARY) "
set name=info.classification \
components/lcms/lcms.p5m
File was renamed from components/lcms/lcms.ips
@@ -21,7 +21,7 @@
# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
    value=pkg:/$(PUBLISHER)/library/lcms@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
    value=pkg:/library/lcms@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.description value="$(COMPONENT_DESCRIPTION) "
set name=pkg.summary value="$(COMPONENT_SUMMARY) "
set name=info.classification \
components/pycups/pycups.p5m
File was renamed from components/pycups/pycups.ips
@@ -21,7 +21,7 @@
# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
    value=pkg:/$(PUBLISHER)/library/python-2/pycups@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
    value=pkg:/library/python-2/pycups@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.description value="$(COMPONENT_DESCRIPTION) "
set name=pkg.summary value="$(COMPONENT_SUMMARY) "
set name=info.classification \
@@ -33,11 +33,11 @@
dir path=usr
dir path=usr/lib
dir path=usr/lib/python2.6
dir path=usr/lib/python2.6/site-packages
dir path=usr/lib/python2.6/site-packages/64
file path=usr/lib/python2.6/site-packages/64/cups.so variant.arch=$(ARCH)
file path=usr/lib/python2.6/site-packages/cups-1.0-py2.6.egg-info
file path=usr/lib/python2.6/site-packages/cups.so variant.arch=$(ARCH)
dir path=usr/lib/python2.6/vendor-packages
dir path=usr/lib/python2.6/vendor-packages/64
file path=usr/lib/python2.6/vendor-packages/64/cups.so variant.arch=$(ARCH)
file path=usr/lib/python2.6/vendor-packages/cups-1.0-py2.6.egg-info
file path=usr/lib/python2.6/vendor-packages/cups.so variant.arch=$(ARCH)
depend fmri=pkg:/library/print/cups-libs@1.4.2-0.143 type=require
depend fmri=pkg:/runtime/python-26@2.6.4-0.143 type=require
depend fmri=pkg:/system/library@0.5.11-0.143 type=require
components/rsync/rsync.p5m
File was renamed from components/rsync/rsync.ips
@@ -21,7 +21,7 @@
# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
    value=pkg:/$(PUBLISHER)/network/rsync@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
    value=pkg:/network/rsync@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.description value="$(COMPONENT_DESCRIPTION) "
set name=pkg.summary value="$(COMPONENT_SUMMARY) "
set name=info.classification \
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
make-rules/setup.py.mk
@@ -36,10 +36,16 @@
    $(COMPONENT_POST_BUILD_ACTION)
    $(TOUCH) $@
# The default is site-packages, but that directory belongs to the end-user.
# Modules which are shipped by the OS but not with the core Python distribution
# belong in vendor-packages.
PYTHON_LIB= /usr/lib/python$(PYTHON_VERSION)/vendor-packages
# install the built source into a prototype area
$(COMPONENT_SRC)/build-%/.installed:    $(COMPONENT_SRC)/build-%/.built
    $(COMPONENT_PRE_INSTALL_ACTION)
    (cd $(COMPONENT_SRC) ; $(ENV) $(PYTHON_ENV) \
        $(PYTHON.$(BITS)) ./setup.py install --root $(PROTO_DIR))
        $(PYTHON.$(BITS)) ./setup.py install --root $(PROTO_DIR) \
            --install-lib=$(PYTHON_LIB))
    $(COMPONENT_POST_INSTALL_ACTION)
    $(TOUCH) $@
transforms/manifest-metadata-template
@@ -21,7 +21,7 @@
# Copyright (c) 2010, Oracle and/or it's affiliates.  All rights reserved.
#
set name=pkg.fmri value=pkg:/$(PUBLISHER)/$(IPS_PKG_NAME)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.fmri value=pkg:/$(IPS_PKG_NAME)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="$(COMPONENT_SUMMARY) "
set name=pkg.description value="$(COMPONENT_DESCRIPTION) "
set name=info.classification value="org.opensolaris.category.2008:$(COMPONENT_CLASSIFICATION) "