From d05a6f00f61de9b48a00c0121df92afb5ed9d4a9 Mon Sep 17 00:00:00 2001
From: Norm Jacobs <Norm.Jacobs@Oracle.COM>
Date: Wed, 23 Mar 2011 00:12:59 +0100
Subject: [PATCH] 7020836 revert workaround in 7014413 now that pkglint doesn't complain 7028457 userland python2.6 should autogenerate dependencies 7028462 historical packaging should move to its own space 7028868 userland build should create architecture specific repositories 7028867 full userland build should refresh its repo catalog 7028870 userland's default publisher should be 'userland'
---
components/meta-packages/history/SUNWgnu-readline.p5m | 0
components/meta-packages/history/SUNWgzip.p5m | 0
components/patch/patch.p5m | 1
components/meta-packages/history/SUNWggrp.p5m | 0
components/meta-packages/history/SUNWgnu-automake-110.p5m | 0
components/meta-packages/history/SUNWgnu-automake-19.p5m | 0
components/meta-packages/history/SUNWless.p5m | 0
components/meta-packages/history/SUNWgm4.p5m | 0
components/meta-packages/history/SUNWpython26-pyopenssl.p5m | 0
components/meta-packages/history/SUNWlibtool.p5m | 0
components/meta-packages/history/SUNWgtar.p5m | 0
components/meta-packages/history/SUNWlogilab-astng.p5m | 0
components/bash/bash.p5m | 3
components/meta-packages/history/SUNWlibsigsegv.p5m | 0
components/meta-packages/history/SUNWltdl.p5m | 0
components/meta-packages/history/SUNWmercurial.p5m | 0
components/meta-packages/history/SUNWgutenprint.p5m | 0
components/meta-packages/history/SUNWbzip.p5m | 0
components/mercurial/mercurial.p5m | 2
components/meta-packages/history/SUNWgmake.p5m | 0
components/meta-packages/history/SUNWbison.p5m | 0
components/meta-packages/history/SUNWPython26.p5m | 0
components/meta-packages/history/SUNWp7zip.p5m | 0
components/meta-packages/history/SUNWlogilab-common.p5m | 0
components/meta-packages/history/SUNWfcgi-doc.p5m | 0
components/meta-packages/history/SUNWaconf.p5m | 0
tools/python/pkglint/userland.py | 13 +++
components/meta-packages/history/SUNWant.p5m | 0
components/meta-packages/history/Makefile | 41 ++++++++++
components/meta-packages/history/SUNWautogen.p5m | 0
components/meta-packages/history/SUNWzip.p5m | 0
components/meta-packages/history/SUNWtcpdump.p5m | 0
components/meta-packages/history/SUNWtop.p5m | 0
components/which/which.p5m | 1
components/meta-packages/history/SUNWgnu-diffutils.p5m | 0
components/meta-packages/history/SUNWgsed.p5m | 0
components/meta-packages/history/SUNWneon.p5m | 0
components/meta-packages/history/SUNWscreen.p5m | 0
components/meta-packages/history/SUNWpwgen.p5m | 0
components/meta-packages/history/SUNWa2ps.p5m | 0
components/python/python26/Makefile | 9 --
components/python/python26/python-26.p5m | 66 ++++++----------
components/meta-packages/history/SUNWwireshark.p5m | 0
components/gnu-gs-fonts-std/gnu-gs-fonts-std.p5m | 1
components/meta-packages/history/SUNWtcat-examples.p5m | 0
components/meta-packages/history/SUNWtcat.p5m | 0
components/meta-packages/history/SUNWbash.p5m | 0
components/meta-packages/history/SUNWgawk.p5m | 0
components/meta-packages/history/SUNWgnu-which.p5m | 0
components/meta-packages/history/SUNWgsfst.p5m | 0
components/meta-packages/history/SUNWelinks.p5m | 0
components/Makefile | 4
components/meta-packages/history/SUNWtcsh.p5m | 0
components/meta-packages/history/SUNWgsfot.p5m | 0
make-rules/ips.mk | 31 ++++---
components/meta-packages/history/SUNWwget.p5m | 0
components/meta-packages/history/SUNWlua.p5m | 0
components/meta-packages/history/SUNWgpch.p5m | 0
components/meta-packages/history/SUNWgnu-gperf.p5m | 0
components/meta-packages/history/SUNWfcgi.p5m | 0
components/meta-packages/history/SUNWzsh.p5m | 0
transforms/locale | 6 -
components/gnu-gs-fonts-other/gnu-gs-fonts-other.p5m | 1
make-rules/shared-macros.mk | 10 +-
components/meta-packages/history/SUNWgd2.p5m | 0
components/meta-packages/history/SUNWgnu-coreutils.p5m | 0
66 files changed, 103 insertions(+), 86 deletions(-)
diff --git a/components/Makefile b/components/Makefile
index c59465c..0b16926 100644
--- a/components/Makefile
+++ b/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:
diff --git a/components/bash/bash.p5m b/components/bash/bash.p5m
index 0e161ce..3c4b5c8 100644
--- a/components/bash/bash.p5m
+++ b/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)
diff --git a/components/gnu-gs-fonts-other/gnu-gs-fonts-other.p5m b/components/gnu-gs-fonts-other/gnu-gs-fonts-other.p5m
index f5d6d88..2ba9582 100644
--- a/components/gnu-gs-fonts-other/gnu-gs-fonts-other.p5m
+++ b/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)
diff --git a/components/gnu-gs-fonts-std/gnu-gs-fonts-std.p5m b/components/gnu-gs-fonts-std/gnu-gs-fonts-std.p5m
index b986da9..9803d4e 100644
--- a/components/gnu-gs-fonts-std/gnu-gs-fonts-std.p5m
+++ b/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)
diff --git a/components/mercurial/mercurial.p5m b/components/mercurial/mercurial.p5m
index a5539ef..9b87499 100644
--- a/components/mercurial/mercurial.p5m
+++ b/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
diff --git a/components/meta-packages/history/Makefile b/components/meta-packages/history/Makefile
new file mode 100644
index 0000000..52ef631
--- /dev/null
+++ b/components/meta-packages/history/Makefile
@@ -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)
diff --git a/components/python/python26/SUNWPython26.p5m b/components/meta-packages/history/SUNWPython26.p5m
similarity index 100%
rename from components/python/python26/SUNWPython26.p5m
rename to components/meta-packages/history/SUNWPython26.p5m
diff --git a/components/a2ps/SUNWa2ps.p5m b/components/meta-packages/history/SUNWa2ps.p5m
similarity index 100%
rename from components/a2ps/SUNWa2ps.p5m
rename to components/meta-packages/history/SUNWa2ps.p5m
diff --git a/components/autoconf/SUNWaconf.p5m b/components/meta-packages/history/SUNWaconf.p5m
similarity index 100%
rename from components/autoconf/SUNWaconf.p5m
rename to components/meta-packages/history/SUNWaconf.p5m
diff --git a/components/ant/SUNWant.p5m b/components/meta-packages/history/SUNWant.p5m
similarity index 100%
rename from components/ant/SUNWant.p5m
rename to components/meta-packages/history/SUNWant.p5m
diff --git a/components/autogen/SUNWautogen.p5m b/components/meta-packages/history/SUNWautogen.p5m
similarity index 100%
rename from components/autogen/SUNWautogen.p5m
rename to components/meta-packages/history/SUNWautogen.p5m
diff --git a/components/bash/SUNWbash.p5m b/components/meta-packages/history/SUNWbash.p5m
similarity index 100%
rename from components/bash/SUNWbash.p5m
rename to components/meta-packages/history/SUNWbash.p5m
diff --git a/components/bison/SUNWbison.p5m b/components/meta-packages/history/SUNWbison.p5m
similarity index 100%
rename from components/bison/SUNWbison.p5m
rename to components/meta-packages/history/SUNWbison.p5m
diff --git a/components/bzip2/SUNWbzip.p5m b/components/meta-packages/history/SUNWbzip.p5m
similarity index 100%
rename from components/bzip2/SUNWbzip.p5m
rename to components/meta-packages/history/SUNWbzip.p5m
diff --git a/components/elinks/SUNWelinks.p5m b/components/meta-packages/history/SUNWelinks.p5m
similarity index 100%
rename from components/elinks/SUNWelinks.p5m
rename to components/meta-packages/history/SUNWelinks.p5m
diff --git a/components/fastcgi/SUNWfcgi-doc.p5m b/components/meta-packages/history/SUNWfcgi-doc.p5m
similarity index 100%
rename from components/fastcgi/SUNWfcgi-doc.p5m
rename to components/meta-packages/history/SUNWfcgi-doc.p5m
diff --git a/components/fastcgi/SUNWfcgi.p5m b/components/meta-packages/history/SUNWfcgi.p5m
similarity index 100%
rename from components/fastcgi/SUNWfcgi.p5m
rename to components/meta-packages/history/SUNWfcgi.p5m
diff --git a/components/gawk/SUNWgawk.p5m b/components/meta-packages/history/SUNWgawk.p5m
similarity index 100%
rename from components/gawk/SUNWgawk.p5m
rename to components/meta-packages/history/SUNWgawk.p5m
diff --git a/components/gd2/SUNWgd2.p5m b/components/meta-packages/history/SUNWgd2.p5m
similarity index 100%
rename from components/gd2/SUNWgd2.p5m
rename to components/meta-packages/history/SUNWgd2.p5m
diff --git a/components/ggrep/SUNWggrp.p5m b/components/meta-packages/history/SUNWggrp.p5m
similarity index 100%
rename from components/ggrep/SUNWggrp.p5m
rename to components/meta-packages/history/SUNWggrp.p5m
diff --git a/components/m4/SUNWgm4.p5m b/components/meta-packages/history/SUNWgm4.p5m
similarity index 100%
rename from components/m4/SUNWgm4.p5m
rename to components/meta-packages/history/SUNWgm4.p5m
diff --git a/components/make/SUNWgmake.p5m b/components/meta-packages/history/SUNWgmake.p5m
similarity index 100%
rename from components/make/SUNWgmake.p5m
rename to components/meta-packages/history/SUNWgmake.p5m
diff --git a/components/automake/automake-1.10/SUNWgnu-automake-110.p5m b/components/meta-packages/history/SUNWgnu-automake-110.p5m
similarity index 100%
rename from components/automake/automake-1.10/SUNWgnu-automake-110.p5m
rename to components/meta-packages/history/SUNWgnu-automake-110.p5m
diff --git a/components/automake/automake-1.9.6/SUNWgnu-automake-19.p5m b/components/meta-packages/history/SUNWgnu-automake-19.p5m
similarity index 100%
rename from components/automake/automake-1.9.6/SUNWgnu-automake-19.p5m
rename to components/meta-packages/history/SUNWgnu-automake-19.p5m
diff --git a/components/coreutils/SUNWgnu-coreutils.p5m b/components/meta-packages/history/SUNWgnu-coreutils.p5m
similarity index 100%
rename from components/coreutils/SUNWgnu-coreutils.p5m
rename to components/meta-packages/history/SUNWgnu-coreutils.p5m
diff --git a/components/diffutils/SUNWgnu-diffutils.p5m b/components/meta-packages/history/SUNWgnu-diffutils.p5m
similarity index 100%
rename from components/diffutils/SUNWgnu-diffutils.p5m
rename to components/meta-packages/history/SUNWgnu-diffutils.p5m
diff --git a/components/gperf/SUNWgnu-gperf.p5m b/components/meta-packages/history/SUNWgnu-gperf.p5m
similarity index 100%
rename from components/gperf/SUNWgnu-gperf.p5m
rename to components/meta-packages/history/SUNWgnu-gperf.p5m
diff --git a/components/readline/SUNWgnu-readline.p5m b/components/meta-packages/history/SUNWgnu-readline.p5m
similarity index 100%
rename from components/readline/SUNWgnu-readline.p5m
rename to components/meta-packages/history/SUNWgnu-readline.p5m
diff --git a/components/which/SUNWgnu-which.p5m b/components/meta-packages/history/SUNWgnu-which.p5m
similarity index 100%
rename from components/which/SUNWgnu-which.p5m
rename to components/meta-packages/history/SUNWgnu-which.p5m
diff --git a/components/patch/SUNWgpch.p5m b/components/meta-packages/history/SUNWgpch.p5m
similarity index 100%
rename from components/patch/SUNWgpch.p5m
rename to components/meta-packages/history/SUNWgpch.p5m
diff --git a/components/sed/SUNWgsed.p5m b/components/meta-packages/history/SUNWgsed.p5m
similarity index 100%
rename from components/sed/SUNWgsed.p5m
rename to components/meta-packages/history/SUNWgsed.p5m
diff --git a/components/gnu-gs-fonts-other/SUNWgsfot.p5m b/components/meta-packages/history/SUNWgsfot.p5m
similarity index 100%
rename from components/gnu-gs-fonts-other/SUNWgsfot.p5m
rename to components/meta-packages/history/SUNWgsfot.p5m
diff --git a/components/gnu-gs-fonts-std/SUNWgsfst.p5m b/components/meta-packages/history/SUNWgsfst.p5m
similarity index 100%
rename from components/gnu-gs-fonts-std/SUNWgsfst.p5m
rename to components/meta-packages/history/SUNWgsfst.p5m
diff --git a/components/gtar/SUNWgtar.p5m b/components/meta-packages/history/SUNWgtar.p5m
similarity index 100%
rename from components/gtar/SUNWgtar.p5m
rename to components/meta-packages/history/SUNWgtar.p5m
diff --git a/components/gutenprint/SUNWgutenprint.p5m b/components/meta-packages/history/SUNWgutenprint.p5m
similarity index 100%
rename from components/gutenprint/SUNWgutenprint.p5m
rename to components/meta-packages/history/SUNWgutenprint.p5m
diff --git a/components/gzip/SUNWgzip.p5m b/components/meta-packages/history/SUNWgzip.p5m
similarity index 100%
rename from components/gzip/SUNWgzip.p5m
rename to components/meta-packages/history/SUNWgzip.p5m
diff --git a/components/less/SUNWless.p5m b/components/meta-packages/history/SUNWless.p5m
similarity index 100%
rename from components/less/SUNWless.p5m
rename to components/meta-packages/history/SUNWless.p5m
diff --git a/components/libsigsegv/SUNWlibsigsegv.p5m b/components/meta-packages/history/SUNWlibsigsegv.p5m
similarity index 100%
rename from components/libsigsegv/SUNWlibsigsegv.p5m
rename to components/meta-packages/history/SUNWlibsigsegv.p5m
diff --git a/components/libtool/SUNWlibtool.p5m b/components/meta-packages/history/SUNWlibtool.p5m
similarity index 100%
rename from components/libtool/SUNWlibtool.p5m
rename to components/meta-packages/history/SUNWlibtool.p5m
diff --git a/components/logilab-astng/SUNWlogilab-astng.p5m b/components/meta-packages/history/SUNWlogilab-astng.p5m
similarity index 100%
rename from components/logilab-astng/SUNWlogilab-astng.p5m
rename to components/meta-packages/history/SUNWlogilab-astng.p5m
diff --git a/components/logilab-common/SUNWlogilab-common.p5m b/components/meta-packages/history/SUNWlogilab-common.p5m
similarity index 100%
rename from components/logilab-common/SUNWlogilab-common.p5m
rename to components/meta-packages/history/SUNWlogilab-common.p5m
diff --git a/components/libtool/SUNWltdl.p5m b/components/meta-packages/history/SUNWltdl.p5m
similarity index 100%
rename from components/libtool/SUNWltdl.p5m
rename to components/meta-packages/history/SUNWltdl.p5m
diff --git a/components/lua/SUNWlua.p5m b/components/meta-packages/history/SUNWlua.p5m
similarity index 100%
rename from components/lua/SUNWlua.p5m
rename to components/meta-packages/history/SUNWlua.p5m
diff --git a/components/mercurial/SUNWmercurial.p5m b/components/meta-packages/history/SUNWmercurial.p5m
similarity index 100%
rename from components/mercurial/SUNWmercurial.p5m
rename to components/meta-packages/history/SUNWmercurial.p5m
diff --git a/components/libneon/SUNWneon.p5m b/components/meta-packages/history/SUNWneon.p5m
similarity index 100%
rename from components/libneon/SUNWneon.p5m
rename to components/meta-packages/history/SUNWneon.p5m
diff --git a/components/p7zip/SUNWp7zip.p5m b/components/meta-packages/history/SUNWp7zip.p5m
similarity index 100%
rename from components/p7zip/SUNWp7zip.p5m
rename to components/meta-packages/history/SUNWp7zip.p5m
diff --git a/components/pwgen/SUNWpwgen.p5m b/components/meta-packages/history/SUNWpwgen.p5m
similarity index 100%
rename from components/pwgen/SUNWpwgen.p5m
rename to components/meta-packages/history/SUNWpwgen.p5m
diff --git a/components/python/pyopenssl/SUNWpython26-pyopenssl.p5m b/components/meta-packages/history/SUNWpython26-pyopenssl.p5m
similarity index 100%
rename from components/python/pyopenssl/SUNWpython26-pyopenssl.p5m
rename to components/meta-packages/history/SUNWpython26-pyopenssl.p5m
diff --git a/components/screen/SUNWscreen.p5m b/components/meta-packages/history/SUNWscreen.p5m
similarity index 100%
rename from components/screen/SUNWscreen.p5m
rename to components/meta-packages/history/SUNWscreen.p5m
diff --git a/components/tomcat/SUNWtcat-examples.p5m b/components/meta-packages/history/SUNWtcat-examples.p5m
similarity index 100%
rename from components/tomcat/SUNWtcat-examples.p5m
rename to components/meta-packages/history/SUNWtcat-examples.p5m
diff --git a/components/tomcat/SUNWtcat.p5m b/components/meta-packages/history/SUNWtcat.p5m
similarity index 100%
rename from components/tomcat/SUNWtcat.p5m
rename to components/meta-packages/history/SUNWtcat.p5m
diff --git a/components/tcpdump/SUNWtcpdump.p5m b/components/meta-packages/history/SUNWtcpdump.p5m
similarity index 100%
rename from components/tcpdump/SUNWtcpdump.p5m
rename to components/meta-packages/history/SUNWtcpdump.p5m
diff --git a/components/tcsh/SUNWtcsh.p5m b/components/meta-packages/history/SUNWtcsh.p5m
similarity index 100%
rename from components/tcsh/SUNWtcsh.p5m
rename to components/meta-packages/history/SUNWtcsh.p5m
diff --git a/components/top/SUNWtop.p5m b/components/meta-packages/history/SUNWtop.p5m
similarity index 100%
rename from components/top/SUNWtop.p5m
rename to components/meta-packages/history/SUNWtop.p5m
diff --git a/components/wget/SUNWwget.p5m b/components/meta-packages/history/SUNWwget.p5m
similarity index 100%
rename from components/wget/SUNWwget.p5m
rename to components/meta-packages/history/SUNWwget.p5m
diff --git a/components/wireshark/SUNWwireshark.p5m b/components/meta-packages/history/SUNWwireshark.p5m
similarity index 100%
rename from components/wireshark/SUNWwireshark.p5m
rename to components/meta-packages/history/SUNWwireshark.p5m
diff --git a/components/zip/SUNWzip.p5m b/components/meta-packages/history/SUNWzip.p5m
similarity index 100%
rename from components/zip/SUNWzip.p5m
rename to components/meta-packages/history/SUNWzip.p5m
diff --git a/components/zsh/SUNWzsh.p5m b/components/meta-packages/history/SUNWzsh.p5m
similarity index 100%
rename from components/zsh/SUNWzsh.p5m
rename to components/meta-packages/history/SUNWzsh.p5m
diff --git a/components/patch/patch.p5m b/components/patch/patch.p5m
index c545fd1..a1b1984 100644
--- a/components/patch/patch.p5m
+++ b/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)
diff --git a/components/python/python26/Makefile b/components/python/python26/Makefile
index 8c6e120..734c7f8 100644
--- a/components/python/python26/Makefile
+++ b/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)
diff --git a/components/python/python26/python-26.p5m b/components/python/python26/python-26.p5m
index 9c479b2..a8aad33 100644
--- a/components/python/python26/python-26.p5m
+++ b/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
-
diff --git a/components/which/which.p5m b/components/which/which.p5m
index 5b93366..15dc837 100644
--- a/components/which/which.p5m
+++ b/components/which/which.p5m
@@ -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)
diff --git a/make-rules/ips.mk b/make-rules/ips.mk
index 2253304..15e94cf 100644
--- a/make-rules/ips.mk
+++ b/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)),)
diff --git a/make-rules/shared-macros.mk b/make-rules/shared-macros.mk
index b70140b..2acd046 100644
--- a/make-rules/shared-macros.mk
+++ b/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
diff --git a/tools/python/pkglint/userland.py b/tools/python/pkglint/userland.py
index fad4de9..eb43e34 100644
--- a/tools/python/pkglint/userland.py
+++ b/tools/python/pkglint/userland.py
@@ -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:
diff --git a/transforms/locale b/transforms/locale
index fb908dc..ef59d77 100644
--- a/transforms/locale
+++ b/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>
--
Gitblit v1.9.3