diff -r 29a9d33b67fa -r 0dd96f5ba7da tools/python/pkglint/userland.py --- a/tools/python/pkglint/userland.py Wed Apr 08 10:31:09 2015 -0700 +++ b/tools/python/pkglint/userland.py Wed Apr 08 10:57:52 2015 -0700 @@ -21,7 +21,7 @@ # # -# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. # # Some userland consolidation specific lint checks @@ -69,8 +69,6 @@ "64", "i86pc-solaris-64", # perl path "sun4-solaris-64", # perl path - "i86pc-solaris-thread-multi-64", # perl path - "sun4-solaris-thread-multi-64", # perl path "amd64-solaris" + solaris_ver, # ruby path "sparcv9-solaris" + solaris_ver # ruby path ] @@ -85,10 +83,6 @@ re.compile('^.*/sparcv9(/.*)?$'), re.compile('^.*/i86pc-solaris-64(/.*)?$'), # perl path re.compile('^.*/sun4-solaris-64(/.*)?$'), # perl path - re.compile('^.*/i86pc-solaris-thread-multi-64(/.*)?$'), - # perl path - re.compile('^.*/sun4-solaris-thread-multi-64(/.*)?$'), - # perl path re.compile('^.*/amd64-solaris2\.[0-9]+(/.*)?$'), # ruby path re.compile('^.*/sparcv9-solaris2\.[0-9]+(/.*)?$')