Mercurial Mercurial > upstream > oracle > userland-gate / 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.
7083378 clean up some unneeded pkg.linted attributes
authorMike Sullivan <Mike.Sullivan@Oracle.COM>
Fri, 26 Aug 2011 17:58:22 -0700
changeset 495 4153db6738f5
parent 494 4d0d11d15b72
child 496 4c465de87d81
7083378 clean up some unneeded pkg.linted attributes
components/emacs/gnu-emacs-gtk.p5m file | annotate | diff | comparison | revisions
components/emacs/gnu-emacs-no-x11.p5m file | annotate | diff | comparison | revisions
components/emacs/gnu-emacs-x11.p5m file | annotate | diff | comparison | revisions
components/emacs/gnu-emacs.p5m file | annotate | diff | comparison | revisions
components/gcc45/gcc-45-runtime.p5m file | annotate | diff | comparison | revisions
components/gcc45/gcc-45.p5m file | annotate | diff | comparison | revisions
components/mysql-5-1/mysql-51test.p5m file | annotate | diff | comparison | revisions
components/python/python26/tkinter-26.p5m file | annotate | diff | comparison | revisions
components/samba/samba/samba.p5m file | annotate | diff | comparison | revisions
components/vim/vim-core.p5m file | annotate | diff | comparison | revisions
tools/python/pkglint/userland.py file | annotate | diff | comparison | revisions 
--- a/components/emacs/gnu-emacs-gtk.p5m	Thu Aug 25 12:57:49 2011 -0700
+++ b/components/emacs/gnu-emacs-gtk.p5m	Fri Aug 26 17:58:22 2011 -0700
@@ -43,7 +43,7 @@
 dir path=usr/share/man
 dir path=usr/share/man/man1
 
-file path=usr/bin/emacs-gtk			pkg.linted=True
+file path=usr/bin/emacs-gtk
 hardlink path=usr/bin/emacs-gtk-$(COMPONENT_VERSION) target=emacs-gtk
 file path=usr/share/man/man1/emacs-gtk.1
 
--- a/components/emacs/gnu-emacs-no-x11.p5m	Thu Aug 25 12:57:49 2011 -0700
+++ b/components/emacs/gnu-emacs-no-x11.p5m	Fri Aug 26 17:58:22 2011 -0700
@@ -43,7 +43,7 @@
 dir path=usr/share/man
 dir path=usr/share/man/man1
 
-file path=usr/bin/emacs-nox			pkg.linted=True
+file path=usr/bin/emacs-nox
 hardlink path=usr/bin/emacs-nox-$(COMPONENT_VERSION) target=emacs-nox
 file path=usr/share/man/man1/emacs-nox.1
 
--- a/components/emacs/gnu-emacs-x11.p5m	Thu Aug 25 12:57:49 2011 -0700
+++ b/components/emacs/gnu-emacs-x11.p5m	Fri Aug 26 17:58:22 2011 -0700
@@ -43,7 +43,7 @@
 dir path=usr/share/man
 dir path=usr/share/man/man1
 
-file path=usr/bin/emacs-x			pkg.linted=True
+file path=usr/bin/emacs-x
 hardlink path=usr/bin/emacs-x-$(COMPONENT_VERSION) target=emacs-x
 file path=usr/share/man/man1/emacs-x.1
 
--- a/components/emacs/gnu-emacs.p5m	Thu Aug 25 12:57:49 2011 -0700
+++ b/components/emacs/gnu-emacs.p5m	Fri Aug 26 17:58:22 2011 -0700
@@ -134,36 +134,36 @@
 dir path=usr/share/man
 dir path=usr/share/man/man1
 
-file path=usr/bin/b2m					pkg.linted=True
-file path=usr/bin/ebrowse				pkg.linted=True
+file path=usr/bin/b2m
+file path=usr/bin/ebrowse
 file path=usr/bin/emacs
-file path=usr/bin/emacsclient				pkg.linted=True
+file path=usr/bin/emacsclient
 file path=usr/bin/grep-changelog
 file path=usr/bin/rcs-checkin
-file path=usr/gnu/bin/ctags				pkg.linted=True
-file path=usr/gnu/bin/etags				pkg.linted=True
+file path=usr/gnu/bin/ctags
+file path=usr/gnu/bin/etags
 file path=usr/gnu/share/man/man1/ctags.1
 file path=usr/gnu/share/man/man1/etags.1
 file path=usr/lib/emacs/$(COMPONENT_VERSION)/$(EMACS_ULEVDIR)/cvtmail \
-	mode=0555	pkg.linted=True
+	mode=0555
 file path=usr/lib/emacs/$(COMPONENT_VERSION)/$(EMACS_ULEVDIR)/digest-doc \
-	mode=0555	pkg.linted=True
+	mode=0555
 file path=usr/lib/emacs/$(COMPONENT_VERSION)/$(EMACS_ULEVDIR)/fakemail \
-	mode=0555	pkg.linted=True
+	mode=0555
 file path=usr/lib/emacs/$(COMPONENT_VERSION)/$(EMACS_ULEVDIR)/hexl \
-	mode=0555	pkg.linted=True
+	mode=0555
 file path=usr/lib/emacs/$(COMPONENT_VERSION)/$(EMACS_ULEVDIR)/movemail \
-	mode=0555	pkg.linted=True
+	mode=0555
 file path=usr/lib/emacs/$(COMPONENT_VERSION)/$(EMACS_ULEVDIR)/profile \
-	mode=0555	pkg.linted=True
+	mode=0555
 file path=usr/lib/emacs/$(COMPONENT_VERSION)/$(EMACS_ULEVDIR)/rcs2log \
-	mode=0555	pkg.linted=True
+	mode=0555
 file path=usr/lib/emacs/$(COMPONENT_VERSION)/$(EMACS_ULEVDIR)/sorted-doc \
-	mode=0555	pkg.linted=True
+	mode=0555
 file path=usr/lib/emacs/$(COMPONENT_VERSION)/$(EMACS_ULEVDIR)/update-game-score \
-	mode=0555	pkg.linted=True
+	mode=0555
 file path=usr/lib/emacs/$(COMPONENT_VERSION)/$(EMACS_ULEVDIR)/vcdiff \
-	mode=0555	pkg.linted=True
+	mode=0555
 file path=usr/share/applications/emacs.desktop
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/AUTHORS
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/BABYL
@@ -2281,20 +2281,12 @@
 file path=usr/share/man/man1/grep-changelog.1
 file path=usr/share/man/man1/rcs-checkin.1
 
-
 # This package provides everything needed to run emacs except for the
 # actual emacs binary. Although the /usr/bin/emacs shell script is prepared
 # for the case where no binary is present, that's not a useful configuration.
 # Therefore, require at least one of the binary supplying packages.
-#
-# The use of pkg.linted=true is a workaround for
-#
-#    Bug 18202 - pkglint AttributeError when using require-any depend action
-#    https://defect.opensolaris.org/bz/show_bug.cgi?id=18202
-#
-# and can be removed when that bug is fixed.
-#
-depend type=require-any pkg.linted=true \
+
+depend type=require-any \
 	fmri=pkg:/editor/gnu-emacs/gnu-emacs-gtk \
 	fmri=pkg:/editor/gnu-emacs/gnu-emacs-x11 \
 	fmri=pkg:/editor/gnu-emacs/gnu-emacs-no-x11
--- a/components/gcc45/gcc-45-runtime.p5m	Thu Aug 25 12:57:49 2011 -0700
+++ b/components/gcc45/gcc-45-runtime.p5m	Fri Aug 26 17:58:22 2011 -0700
@@ -28,8 +28,8 @@
     value="org.opensolaris.category.2008:Development/Fortran" \
     value="org.opensolaris.category.2008:Development/GNU" \
     value="org.opensolaris.category.2008:Development/Objective C"
-set name=info.upstream_url value="http://gnu.gcc.org"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value="http://gnu.gcc.org"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=org.opensolaris.arc-caseid value=PSARC/2011/256
 
--- a/components/gcc45/gcc-45.p5m	Thu Aug 25 12:57:49 2011 -0700
+++ b/components/gcc45/gcc-45.p5m	Fri Aug 26 17:58:22 2011 -0700
@@ -29,8 +29,8 @@
     value="org.opensolaris.category.2008:Development/Fortran" \
     value="org.opensolaris.category.2008:Development/GNU" \
     value="org.opensolaris.category.2008:Development/Objective C"
-set name=info.upstream_url value="http://gcc.gnu.org"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value="http://gcc.gnu.org"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=org.opensolaris.arc-caseid value=PSARC/2011/256
 
--- a/components/mysql-5-1/mysql-51test.p5m	Thu Aug 25 12:57:49 2011 -0700
+++ b/components/mysql-5-1/mysql-51test.p5m	Fri Aug 26 17:58:22 2011 -0700
@@ -420,7 +420,7 @@
 file path=usr/mysql/5.1/mysql-test/lib/My/SafeProcess.pm
 file path=usr/mysql/5.1/mysql-test/lib/My/SafeProcess/Base.pm
 file path=usr/mysql/5.1/mysql-test/lib/My/SafeProcess/my_safe_process \
-    mode=0555 pkg.linted=true
+    mode=0555
 file path=usr/mysql/5.1/mysql-test/lib/My/SafeProcess/safe_process.pl \
     mode=0555
 file path=usr/mysql/5.1/mysql-test/lib/My/SysInfo.pm
--- a/components/python/python26/tkinter-26.p5m	Thu Aug 25 12:57:49 2011 -0700
+++ b/components/python/python26/tkinter-26.p5m	Fri Aug 26 17:58:22 2011 -0700
@@ -21,10 +21,6 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-# temporarily tag theses entries until this package is published in a
-# package repo.
-<transform file path=.* -> add pkg.linted true >
-
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
     value=pkg:/library/python-2/tkinter-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- a/components/samba/samba/samba.p5m	Thu Aug 25 12:57:49 2011 -0700
+++ b/components/samba/samba/samba.p5m	Fri Aug 26 17:58:22 2011 -0700
@@ -28,7 +28,6 @@
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2009/682
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set pkg.linted=true
 
 license samba-license license='GPLv3'
 
@@ -265,7 +264,7 @@
 file path=usr/lib/samba/vfs/readahead.so
 file path=usr/lib/samba/vfs/readonly.so
 file path=usr/lib/samba/vfs/recycle.so
-file path=usr/lib/samba/vfs/samfs.so pkg.depend.bypass-generate=.*
+file path=usr/lib/samba/vfs/samfs.so pkg.depend.bypass-generate=.* pkg.linted=true
 file path=usr/lib/samba/vfs/scannedonly.so
 file path=usr/lib/samba/vfs/shadow_copy.so
 file path=usr/lib/samba/vfs/shadow_copy2.so
--- a/components/vim/vim-core.p5m	Thu Aug 25 12:57:49 2011 -0700
+++ b/components/vim/vim-core.p5m	Fri Aug 26 17:58:22 2011 -0700
@@ -69,14 +69,14 @@
 dir path=usr/share/vim
 dir path=usr/share/vim/$(VIMVER)
 dir path=usr/share/vim/$(VIMVER)/doc
-file path=usr/bin/vim pkg.linted=true
+file path=usr/bin/vim
 file path=usr/share/man/fr.ISO8859-1/man1/vim.1
 file path=usr/share/man/fr.UTF-8/man1/vim.1
 file path=usr/share/man/fr/man1/vim.1
 file path=usr/share/man/it.ISO8859-1/man1/vim.1
 file path=usr/share/man/it.UTF-8/man1/vim.1
 file path=usr/share/man/it/man1/vim.1
-file path=usr/share/man/man1/vim.1 pkg.linted=true
+file path=usr/share/man/man1/vim.1
 file path=usr/share/man/pl.ISO8859-2/man1/vim.1
 file path=usr/share/man/pl.UTF-8/man1/vim.1
 file path=usr/share/man/pl/man1/vim.1
--- a/tools/python/pkglint/userland.py	Thu Aug 25 12:57:49 2011 -0700
+++ b/tools/python/pkglint/userland.py	Fri Aug 26 17:58:22 2011 -0700
@@ -224,6 +224,7 @@
 
 		ei = elf.get_info(path)
 		bits = ei.get("bits")
+		type = ei.get("type");
                 elems = os.path.dirname(path).split("/")
 
                 if ("amd64" in elems) or ("sparcv9" in elems) or ("64" in elems):
@@ -231,6 +232,16 @@
                 else:
                     path64 = False
 
+                if ("i86" in elems) or ("sparcv7" in elems) or ("32" in elems):
+                    path32 = True
+                else:
+                    path32 = False
+
+		# ignore 64-bit executables in normal (non-32-bit-specific)
+		# locations, that's ok now.
+		if (type == "exe" and bits == 64 and path32 == False and path64 == False):
+			return result
+
 		if bits == 32 and path64:
 			result = _("32-bit object '%s' in 64-bit path")
 		elif bits == 64 and not path64:
upstream/oracle/userland-gate