20859564 gmake setup no longer works on sparc
20861377 pkglint crashes in openssl on s12-70 sparc
--- a/make-rules/ips-buildinfo.mk Mon May 18 01:59:30 2015 -0700
+++ b/make-rules/ips-buildinfo.mk Mon May 18 12:18:37 2015 -0700
@@ -94,5 +94,5 @@
# Set a default reference repository against which pkglint is run, in case it
# hasn't been set in the environment.
-CANONICAL_REPO ?= http://ipkg.us.oracle.com/solaris11/dev/
+CANONICAL_REPO ?= http://ipkg.us.oracle.com/solaris11/minidev/
--- a/tools/python/pkglint/userland.py Mon May 18 01:59:30 2015 -0700
+++ b/tools/python/pkglint/userland.py Mon May 18 12:18:37 2015 -0700
@@ -21,7 +21,7 @@
#
#
-# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
#
# Some userland consolidation specific lint checks
@@ -124,7 +124,12 @@
variants = action.get_variant_template()
variants.merge_unknown(pkg_vars)
- action.attrs.update(variants)
+ # Action attributes must be lists or strings.
+ for k, v in variants.iteritems():
+ if isinstance(v, set):
+ action.attrs[k] = list(v)
+ else:
+ action.attrs[k] = v
p = action.attrs[attr]
dic.setdefault(p, []).append((mf.fmri, action))