components/Makefile
@@ -103,6 +103,7 @@ $(@:%=--component %) --make $(TARGET) $(LOG) publish: $(PKGREPO) rebuild -s $(PKG_REPO) # pkglint all of the published manifests in one batch. ifdef CANONICAL_REPO @echo 'pkglinting all package manifests...' @@ -122,6 +123,7 @@ @$(BASS_O_MATIC) --workspace=$(WS_TOP) --components=depend \ | sed -e 's;$(shell pwd)/;;g' >$@ -include depends.mk # skip dependency generation until we have a new solution for it. #-include depends.mk FORCE: components/bash/bash.p5m
@@ -21,8 +21,7 @@ # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/shell/bash@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) set name=pkg.summary value="GNU Bourne-Again shell (bash) version 4.1" set name=pkg.description value="GNU Bourne-Again shell (bash) version 4.1" set name=pkg.summary value="GNU Bourne-Again shell (bash)" set name=info.classification value="org.opensolaris.category.2008:System/Shells" set name=info.upstream_url value="http://www.gnu.org/software/bash/" set name=info.source_url value=$(COMPONENT_ARCHIVE_URL) components/gnu-gs-fonts-other/gnu-gs-fonts-other.p5m
@@ -22,7 +22,6 @@ # set name=pkg.fmri value=pkg:/print/filter/ghostscript/fonts/gnu-gs-fonts-other@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) set name=pkg.summary value="GNU Ghostscript Fonts (Other)" set name=pkg.description value="GNU Ghostscript Fonts (Other)" set name=info.classification value="org.opensolaris.category.2008:System/Printing" set name=info.upstream_url value=http://sourceforge.net/projects/gs-fonts/ set name=info.source_url value=$(COMPONENT_ARCHIVE_URL) components/gnu-gs-fonts-std/gnu-gs-fonts-std.p5m
@@ -22,7 +22,6 @@ # set name=pkg.fmri value=pkg:/print/filter/ghostscript/fonts/gnu-gs-fonts-std@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) set name=pkg.summary value="GNU Ghostscript Fonts (Standard)" set name=pkg.description value="GNU Ghostscript Fonts (Standard)" set name=info.classification value="org.opensolaris.category.2008:System/Printing " set name=info.upstream_url value=http://sourceforge.net/projects/gs-fonts/ set name=info.source_url value=$(COMPONENT_ARCHIVE_URL) components/mercurial/mercurial.p5m
@@ -320,7 +320,7 @@ file path=usr/lib/python2.6/vendor-packages/mercurial/repo.pyc file path=usr/lib/python2.6/vendor-packages/mercurial/revlog.py file path=usr/lib/python2.6/vendor-packages/mercurial/revlog.pyc file path=usr/lib/python2.6/vendor-packages/mercurial/simplemerge.py file path=usr/lib/python2.6/vendor-packages/mercurial/simplemerge.py pkg.depend.bypass-generate=.* file path=usr/lib/python2.6/vendor-packages/mercurial/simplemerge.pyc file path=usr/lib/python2.6/vendor-packages/mercurial/sshrepo.py file path=usr/lib/python2.6/vendor-packages/mercurial/sshrepo.pyc components/meta-packages/history/Makefile
New file @@ -0,0 +1,41 @@ # # CDDL HEADER START # # The contents of this file are subject to the terms of the # Common Development and Distribution License (the "License"). # You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. # See the License for the specific language governing permissions # and limitations under the License. # # When distributing Covered Code, include this CDDL HEADER in each # file and include the License file at usr/src/OPENSOLARIS.LICENSE. # If applicable, add the following below this CDDL HEADER, with the # fields enclosed by brackets "[]" replaced with your own identifying # information: Portions Copyright [yyyy] [name of copyright owner] # # CDDL HEADER END # # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. # include ../../../make-rules/shared-macros.mk include $(WS_TOP)/make-rules/ips.mk # we need a empty protodir or pkgsend will complain about it not existing PROTO_DIR= # Don't really do anything for dependency generation PKGDEPEND= /bin/true $(BUILD_DIR): $(MKDIR) $@ download prep test: build install: $(BUILD_DIR) clobber clean: $(RM) -r $(BUILD_DIR) components/meta-packages/history/SUNWPython26.p5m
components/meta-packages/history/SUNWa2ps.p5m
components/meta-packages/history/SUNWaconf.p5m
components/meta-packages/history/SUNWant.p5m
components/meta-packages/history/SUNWautogen.p5m
components/meta-packages/history/SUNWbash.p5m
components/meta-packages/history/SUNWbison.p5m
components/meta-packages/history/SUNWbzip.p5m
components/meta-packages/history/SUNWelinks.p5m
components/meta-packages/history/SUNWfcgi-doc.p5m
components/meta-packages/history/SUNWfcgi.p5m
components/meta-packages/history/SUNWgawk.p5m
components/meta-packages/history/SUNWgd2.p5m
components/meta-packages/history/SUNWggrp.p5m
components/meta-packages/history/SUNWgm4.p5m
components/meta-packages/history/SUNWgmake.p5m
components/meta-packages/history/SUNWgnu-automake-110.p5m
components/meta-packages/history/SUNWgnu-automake-19.p5m
components/meta-packages/history/SUNWgnu-coreutils.p5m
components/meta-packages/history/SUNWgnu-diffutils.p5m
components/meta-packages/history/SUNWgnu-gperf.p5m
components/meta-packages/history/SUNWgnu-readline.p5m
components/meta-packages/history/SUNWgnu-which.p5m
components/meta-packages/history/SUNWgpch.p5m
components/meta-packages/history/SUNWgsed.p5m
components/meta-packages/history/SUNWgsfot.p5m
components/meta-packages/history/SUNWgsfst.p5m
components/meta-packages/history/SUNWgtar.p5m
components/meta-packages/history/SUNWgutenprint.p5m
components/meta-packages/history/SUNWgzip.p5m
components/meta-packages/history/SUNWless.p5m
components/meta-packages/history/SUNWlibsigsegv.p5m
components/meta-packages/history/SUNWlibtool.p5m
components/meta-packages/history/SUNWlogilab-astng.p5m
components/meta-packages/history/SUNWlogilab-common.p5m
components/meta-packages/history/SUNWltdl.p5m
components/meta-packages/history/SUNWlua.p5m
components/meta-packages/history/SUNWmercurial.p5m
components/meta-packages/history/SUNWneon.p5m
components/meta-packages/history/SUNWp7zip.p5m
components/meta-packages/history/SUNWpwgen.p5m
components/meta-packages/history/SUNWpython26-pyopenssl.p5m
components/meta-packages/history/SUNWscreen.p5m
components/meta-packages/history/SUNWtcat-examples.p5m
components/meta-packages/history/SUNWtcat.p5m
components/meta-packages/history/SUNWtcpdump.p5m
components/meta-packages/history/SUNWtcsh.p5m
components/meta-packages/history/SUNWtop.p5m
components/meta-packages/history/SUNWwget.p5m
components/meta-packages/history/SUNWwireshark.p5m
components/meta-packages/history/SUNWzip.p5m
components/meta-packages/history/SUNWzsh.p5m
components/patch/patch.p5m
@@ -23,7 +23,6 @@ set name=pkg.fmri value=pkg:/text/gnu-patch@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) set name=pkg.summary value="The GNU Patch utility" set name=pkg.description value="The GNU Patch utility" set name=info.classification value="org.opensolaris.category.2008:Development/GNU" set name=info.upstream_url value=http://www.gnu.org/software/patch/ set name=info.source_url value=$(COMPONENT_ARCHIVE_URL) components/python/python26/Makefile
@@ -48,15 +48,6 @@ perl -pi -e 's/^(\#define _XOPEN_SOURCE_EXTENDED.*)/\/* $$1 *\//' \ pyconfig.h) # # Until the fix for "17858 pkgdepend generate hurls on some python modules" is # generally installed on our build systems, we need to skip the dependency # generation step. see https://defect.opensolaris.org/bz/show_bug.cgi?id=17858 # When this is fixed, we need to remove the static dependencies from the # manifest. # $(MANIFEST_BASE)-python-26.depend: PKGDEPEND = /bin/true # we don't want to leak $(CC_BITS) into BASECFLAGS as it causes problems with # python-config CC += $(CFLAGS) components/python/python26/python-26.p5m
@@ -106,7 +106,7 @@ link path=usr/bin/python-config target=python2.6-config file path=usr/bin/python2.6-config file path=usr/bin/$(MACH64)/python2.6-config file path=usr/bin/$(MACH64)/python2.6-config pkg.depend.bypass-generate=.* link path=usr/lib/$(MACH64)/libpython2.6_db.so target=libpython2.6_db.so.1.0 file path=usr/lib/$(MACH64)/libpython2.6_db.so.1.0 @@ -274,7 +274,7 @@ file path=usr/lib/python2.6/binhex.pyc file path=usr/lib/python2.6/bisect.py file path=usr/lib/python2.6/bisect.pyc file path=usr/lib/python2.6/cProfile.py file path=usr/lib/python2.6/cProfile.py pkg.depend.bypass-generate=.* file path=usr/lib/python2.6/cProfile.pyc file path=usr/lib/python2.6/calendar.py file path=usr/lib/python2.6/calendar.pyc @@ -1097,7 +1097,7 @@ file path=usr/lib/python2.6/idlelib/Percolator.pyc file path=usr/lib/python2.6/idlelib/PyParse.py file path=usr/lib/python2.6/idlelib/PyParse.pyc file path=usr/lib/python2.6/idlelib/PyShell.py file path=usr/lib/python2.6/idlelib/PyShell.py pkg.depend.bypass-generate=.* file path=usr/lib/python2.6/idlelib/PyShell.pyc file path=usr/lib/python2.6/idlelib/README.txt file path=usr/lib/python2.6/idlelib/RemoteDebugger.py @@ -1469,25 +1469,25 @@ file path=usr/lib/python2.6/lib2to3/pygram.pyc file path=usr/lib/python2.6/lib2to3/pytree.py file path=usr/lib/python2.6/lib2to3/pytree.pyc file path=usr/lib/python2.6/lib2to3/refactor.py file path=usr/lib/python2.6/lib2to3/refactor.py pkg.depend.bypass-generate=.* file path=usr/lib/python2.6/lib2to3/refactor.pyc file path=usr/lib/python2.6/lib2to3/tests/__init__.py file path=usr/lib/python2.6/lib2to3/tests/__init__.pyc file path=usr/lib/python2.6/lib2to3/tests/pytree_idempotency.py file path=usr/lib/python2.6/lib2to3/tests/pytree_idempotency.py pkg.depend.bypass-generate=.* file path=usr/lib/python2.6/lib2to3/tests/pytree_idempotency.pyc file path=usr/lib/python2.6/lib2to3/tests/support.py file path=usr/lib/python2.6/lib2to3/tests/support.pyc file path=usr/lib/python2.6/lib2to3/tests/test_all_fixers.py file path=usr/lib/python2.6/lib2to3/tests/test_all_fixers.py pkg.depend.bypass-generate=.* file path=usr/lib/python2.6/lib2to3/tests/test_all_fixers.pyc file path=usr/lib/python2.6/lib2to3/tests/test_fixers.py file path=usr/lib/python2.6/lib2to3/tests/test_fixers.py pkg.depend.bypass-generate=.* file path=usr/lib/python2.6/lib2to3/tests/test_fixers.pyc file path=usr/lib/python2.6/lib2to3/tests/test_parser.py file path=usr/lib/python2.6/lib2to3/tests/test_parser.py pkg.depend.bypass-generate=.* file path=usr/lib/python2.6/lib2to3/tests/test_parser.pyc file path=usr/lib/python2.6/lib2to3/tests/test_pytree.py file path=usr/lib/python2.6/lib2to3/tests/test_pytree.py pkg.depend.bypass-generate=.* file path=usr/lib/python2.6/lib2to3/tests/test_pytree.pyc file path=usr/lib/python2.6/lib2to3/tests/test_refactor.py file path=usr/lib/python2.6/lib2to3/tests/test_refactor.pyc file path=usr/lib/python2.6/lib2to3/tests/test_util.py file path=usr/lib/python2.6/lib2to3/tests/test_util.py pkg.depend.bypass-generate=.* file path=usr/lib/python2.6/lib2to3/tests/test_util.pyc file path=usr/lib/python2.6/linecache.py file path=usr/lib/python2.6/linecache.pyc @@ -1574,7 +1574,7 @@ file path=usr/lib/python2.6/os2emxpath.py file path=usr/lib/python2.6/os2emxpath.pyc file path=usr/lib/python2.6/pdb.doc file path=usr/lib/python2.6/pdb.py file path=usr/lib/python2.6/pdb.py pkg.depend.bypass-generate=.* file path=usr/lib/python2.6/pdb.pyc file path=usr/lib/python2.6/pickle.py file path=usr/lib/python2.6/pickle.pyc @@ -1597,7 +1597,7 @@ file path=usr/lib/python2.6/plat-sunos5/TYPES.py file path=usr/lib/python2.6/plat-sunos5/TYPES.pyc file path=usr/lib/python2.6/plat-sunos5/regen mode=0555 file path=usr/lib/python2.6/platform.py file path=usr/lib/python2.6/platform.py pkg.depend.bypass-generate=.* file path=usr/lib/python2.6/platform.pyc file path=usr/lib/python2.6/plistlib.py file path=usr/lib/python2.6/plistlib.pyc @@ -1611,7 +1611,7 @@ file path=usr/lib/python2.6/posixpath.pyc file path=usr/lib/python2.6/pprint.py file path=usr/lib/python2.6/pprint.pyc file path=usr/lib/python2.6/profile.py file path=usr/lib/python2.6/profile.py pkg.depend.bypass-generate=.* file path=usr/lib/python2.6/profile.pyc file path=usr/lib/python2.6/pstats.py file path=usr/lib/python2.6/pstats.pyc @@ -1623,7 +1623,7 @@ file path=usr/lib/python2.6/py_compile.pyc file path=usr/lib/python2.6/pyclbr.py file path=usr/lib/python2.6/pyclbr.pyc file path=usr/lib/python2.6/pydoc.py file path=usr/lib/python2.6/pydoc.py pkg.depend.bypass-generate=.* file path=usr/lib/python2.6/pydoc.pyc file path=usr/lib/python2.6/pydoc_topics.py file path=usr/lib/python2.6/pydoc_topics.pyc @@ -1663,7 +1663,7 @@ file path=usr/lib/python2.6/site-packages/vendor-packages.pth file path=usr/lib/python2.6/site.py file path=usr/lib/python2.6/site.pyc file path=usr/lib/python2.6/smtpd.py file path=usr/lib/python2.6/smtpd.py pkg.depend.bypass-generate=.* file path=usr/lib/python2.6/smtpd.pyc file path=usr/lib/python2.6/smtplib.py file path=usr/lib/python2.6/smtplib.pyc @@ -1960,7 +1960,7 @@ file path=usr/lib/python2.6/test/re_tests.pyc file path=usr/lib/python2.6/test/regex_tests.py file path=usr/lib/python2.6/test/regex_tests.pyc file path=usr/lib/python2.6/test/regrtest.py file path=usr/lib/python2.6/test/regrtest.py pkg.depend.bypass-generate=.* file path=usr/lib/python2.6/test/regrtest.pyc file path=usr/lib/python2.6/test/relimport.py file path=usr/lib/python2.6/test/relimport.pyc @@ -2038,7 +2038,7 @@ file path=usr/lib/python2.6/test/test_bisect.pyc file path=usr/lib/python2.6/test/test_bool.py file path=usr/lib/python2.6/test/test_bool.pyc file path=usr/lib/python2.6/test/test_bsddb.py file path=usr/lib/python2.6/test/test_bsddb.py pkg.depend.bypass-generate=.* file path=usr/lib/python2.6/test/test_bsddb.pyc file path=usr/lib/python2.6/test/test_bsddb185.py file path=usr/lib/python2.6/test/test_bsddb185.pyc @@ -2060,7 +2060,7 @@ file path=usr/lib/python2.6/test/test_call.pyc file path=usr/lib/python2.6/test/test_capi.py file path=usr/lib/python2.6/test/test_capi.pyc file path=usr/lib/python2.6/test/test_cd.py file path=usr/lib/python2.6/test/test_cd.py pkg.depend.bypass-generate=.* file path=usr/lib/python2.6/test/test_cd.pyc file path=usr/lib/python2.6/test/test_cfgparser.py file path=usr/lib/python2.6/test/test_cfgparser.pyc @@ -2068,7 +2068,7 @@ file path=usr/lib/python2.6/test/test_cgi.pyc file path=usr/lib/python2.6/test/test_charmapcodec.py file path=usr/lib/python2.6/test/test_charmapcodec.pyc file path=usr/lib/python2.6/test/test_cl.py file path=usr/lib/python2.6/test/test_cl.py pkg.depend.bypass-generate=.* file path=usr/lib/python2.6/test/test_cl.pyc file path=usr/lib/python2.6/test/test_class.py file path=usr/lib/python2.6/test/test_class.pyc @@ -2279,7 +2279,7 @@ file path=usr/lib/python2.6/test/test_getopt.pyc file path=usr/lib/python2.6/test/test_gettext.py file path=usr/lib/python2.6/test/test_gettext.pyc file path=usr/lib/python2.6/test/test_gl.py file path=usr/lib/python2.6/test/test_gl.py pkg.depend.bypass-generate=.* file path=usr/lib/python2.6/test/test_gl.pyc file path=usr/lib/python2.6/test/test_glob.py file path=usr/lib/python2.6/test/test_glob.pyc @@ -2309,7 +2309,7 @@ file path=usr/lib/python2.6/test/test_httplib.pyc file path=usr/lib/python2.6/test/test_httpservers.py file path=usr/lib/python2.6/test/test_httpservers.pyc file path=usr/lib/python2.6/test/test_imageop.py file path=usr/lib/python2.6/test/test_imageop.py pkg.depend.bypass-generate=.* file path=usr/lib/python2.6/test/test_imageop.pyc file path=usr/lib/python2.6/test/test_imaplib.py file path=usr/lib/python2.6/test/test_imaplib.pyc @@ -2437,7 +2437,7 @@ file path=usr/lib/python2.6/test/test_peepholer.pyc file path=usr/lib/python2.6/test/test_pep247.py file path=usr/lib/python2.6/test/test_pep247.pyc file path=usr/lib/python2.6/test/test_pep263.py file path=usr/lib/python2.6/test/test_pep263.py pkg.depend.bypass-generate=.* file path=usr/lib/python2.6/test/test_pep263.pyc file path=usr/lib/python2.6/test/test_pep277.py file path=usr/lib/python2.6/test/test_pep277.pyc @@ -2758,7 +2758,7 @@ file path=usr/lib/python2.6/token.pyc file path=usr/lib/python2.6/tokenize.py file path=usr/lib/python2.6/tokenize.pyc file path=usr/lib/python2.6/trace.py file path=usr/lib/python2.6/trace.py pkg.depend.bypass-generate=.* file path=usr/lib/python2.6/trace.pyc file path=usr/lib/python2.6/traceback.py file path=usr/lib/python2.6/traceback.pyc @@ -2786,7 +2786,7 @@ file path=usr/lib/python2.6/wave.pyc file path=usr/lib/python2.6/weakref.py file path=usr/lib/python2.6/weakref.pyc file path=usr/lib/python2.6/webbrowser.py file path=usr/lib/python2.6/webbrowser.py pkg.depend.bypass-generate=.* file path=usr/lib/python2.6/webbrowser.pyc file path=usr/lib/python2.6/whichdb.py file path=usr/lib/python2.6/whichdb.pyc @@ -2942,21 +2942,3 @@ name="The Python interpreter, libraries and utilities - development files" \ category="GNOME2,application,JDS4" \ vendor=Python.org # keep this until dependency generation is fixed depend fmri=compress/bzip2 type=require depend fmri=database/sqlite-3 type=require depend fmri=library/database/gdbm type=require depend fmri=library/libffi type=require depend fmri=library/ncurses type=require depend fmri=library/readline type=require depend fmri=library/security/openssl type=require depend fmri=library/zlib type=require depend fmri=runtime/tcl-8 type=require depend fmri=runtime/tk-8 type=require depend fmri=SUNWcs type=require depend fmri=system/library type=require depend fmri=system/library/math type=require depend fmri=x11/compatibility/links-xorg type=require depend fmri=x11/library/libx11 type=require
@@ -22,7 +22,6 @@ # set name=pkg.fmri value=pkg:/shell/which@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) set name=pkg.summary value="GNU which" set name=pkg.description value="GNU which" set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities" set name=info.upstream_url value="http://www.xs4all.nl/~carlo17/which/" set name=info.source_url value=$(COMPONENT_ARCHIVE_URL) make-rules/ips.mk
@@ -85,20 +85,17 @@ MANIFESTS = $(CANONICAL_MANIFESTS:%=$(MANIFEST_BASE)-%) MOGRIFIED=$(CANONICAL_MANIFESTS:%.p5m=$(MANIFEST_BASE)-%.resolved) PUBLISHED=$(MOGRIFIED:%.resolved=%.published) RESOLVED=$(CANONICAL_MANIFESTS:%.p5m=$(MANIFEST_BASE)-%.resolved) PUBLISHED=$(RESOLVED:%.resolved=%.published) COPYRIGHT_FILE = $(COMPONENT_NAME)-$(COMPONENT_VERSION).copyright ifeq ($(IPS_PKG_NAME),) IPS_PKG_NAME = $(COMPONENT_NAME) endif IPS_COMPONENT_VERSION = $(COMPONENT_VERSION) IPS_COMPONENT_VERSION ?= $(COMPONENT_VERSION) .DEFAULT: publish .SECONDARY: publish: install $(BUILD_DIR)/.published publish: install $(BUILD_DIR)/.published-$(MACH) sample-manifest: $(GENERATED).p5m @@ -131,22 +128,26 @@ sed -e '/^$$/d' -e '/^#.*$$/d' ; \ $(PKGDEPEND) resolve -o $< | sed -e '1d') | uniq >$@ # lint the manifest before we publish with it. $(MANIFEST_BASE)-%.linted: $(MANIFEST_BASE)-%.resolved @echo "VALIDATING MANIFEST CONTENT: $<" $(BUILD_DIR)/.resolved-$(MACH): $(RESOLVED) $(TOUCH) $@ # lint the manifests all at once $(BUILD_DIR)/.linted-$(MACH): $(BUILD_DIR)/.resolved-$(MACH) @echo "VALIDATING MANIFEST CONTENT: $(RESOLVED)" $(ENV) PYTHONPATH=$(WS_TOOLS)/python PROTO_PATH="$(PKG_PROTO_DIRS)"\ $(PKGLINT) $(CANONICAL_REPO:%=-c $(WS_LINT_CACHE)) \ -f $(WS_TOOLS)/pkglintrc $< $(PKGFMT) <$< >$@ -f $(WS_TOOLS)/pkglintrc $(RESOLVED) $(TOUCH) $@ # published PKGSEND_PUBLISH_OPTIONS = -s $(PKG_REPO) publish --fmri-in-manifest PKGSEND_PUBLISH_OPTIONS += $(PKG_PROTO_DIRS:%=-d %) $(MANIFEST_BASE)-%.published: $(MANIFEST_BASE)-%.linted $(MANIFEST_BASE)-%.published: $(MANIFEST_BASE)-%.resolved $(BUILD_DIR)/.linted-$(MACH) $(PKGSEND) $(PKGSEND_PUBLISH_OPTIONS) $< $(PKGFMT) <$< >$@ $(BUILD_DIR)/.published: $(PUBLISHED) $(BUILD_DIR)/.published-$(MACH): $(PUBLISHED) $(TOUCH) $@ print-package-names: canonical-manifests @@ -169,7 +170,7 @@ echo "unsafe to install package(s) automatically" ; \ fi $(MOGRIFIED): install $(RESOLVED): install canonical-manifests: $(CANONICAL_MANIFESTS) Makefile $(PATCHES) ifeq ($(strip $(CANONICAL_MANIFESTS)),) make-rules/shared-macros.mk
@@ -25,13 +25,13 @@ # Default to looking for source archives on the internal mirror before we # hammer on the external repositories. export DOWNLOAD_SEARCH_PATH ?= http://userland.us.oracle.com/source-archives/ export DOWNLOAD_SEARCH_PATH += http://userland.us.oracle.com/source-archives/ # The workspace starts at the mercurial root export WS_TOP ?= $(shell hg root) CONSOLIDATION = userland PUBLISHER = $(CONSOLIDATION)-build PUBLISHER ?= $(CONSOLIDATION) IS_GLOBAL_ZONE = $(shell /usr/sbin/zoneadm list | grep -c global) ROOT = / @@ -51,13 +51,13 @@ PYTHON_VERSION = 2.6 PYTHON_VERSIONS = 2.6 WS_LOGS = $(WS_TOP)/logs WS_REPO = $(WS_TOP)/repo WS_LOGS = $(WS_TOP)/$(MACH)/logs WS_REPO = $(WS_TOP)/$(MACH)/repo WS_TOOLS = $(WS_TOP)/tools WS_MAKE_RULES = $(WS_TOP)/make-rules WS_COMPONENTS = $(WS_TOP)/components WS_INCORPORATIONS = $(WS_TOP)/incorporations WS_LINT_CACHE = $(WS_TOP)/pkglint-cache WS_LINT_CACHE = $(WS_TOP)/$(MACH)/pkglint-cache BASS_O_MATIC = $(WS_TOOLS)/bass-o-matic
@@ -120,7 +120,7 @@ path = action.attrs["path"] # check for writable files without a preserve attribute if 'mode' in action.attrs: if "mode" in action.attrs: mode = action.attrs["mode"] if (int(mode, 8) & 0222) != 0 and "preserve" not in action.attrs: @@ -128,6 +128,17 @@ _("%(path)s is writable (%(mode)s), but missing a preserve" " attribute") % {"path": path, "mode": mode}, msgid="%s%s.0" % (self.name, pkglint_id)) elif "preserve" in action.attrs: if "mode" in action.attrs: mode = action.attrs["mode"] if (int(mode, 8) & 0222) == 0: engine.error( _("%(path)s has a preserve action, but is not writable (%(mode)s)") % {"path": path, "mode": mode}, msgid="%s%s.4" % (self.name, pkglint_id)) else: engine.error( _("%(path)s has a preserve action, but no mode") % {"path": path, "mode": mode}, msgid="%s%s.3" % (self.name, pkglint_id)) # checks that require a physical file to look at if self.proto_path is not None: transforms/locale
@@ -29,9 +29,3 @@ <transform dir file link hardlink \ path=.*/locale/([^/]+)(\..+){0,1}(/.+){0,1}$ -> \ default facet.locale.%<\1> true> # skip pkglint(1) on actions where where facet.locale tags contains '_' until # we can change this to only skip the '_' in attribute name warning. <transform dir file link hardlink \ path=.*/locale/[^_/]+_[^/]+(/.+){0,1}$ -> \ default pkg.linted true>
