Mercurial Mercurial > upstream > oracle > pkg-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.
24838050 add content-hash for compressed hash attributes s11u3-sru
authorsaurabh.vyas@oracle.com
Thu, 08 Dec 2016 03:41:19 +0530
branchs11u3-sru
changeset 3497 2b9327d94ee0
parent 3496 85ee955afa79
child 3498 3c1a7afe9c60
24838050 add content-hash for compressed hash attributes
src/modules/client/transport/transport.py file | annotate | diff | comparison | revisions
src/modules/digest.py file | annotate | diff | comparison | revisions
src/modules/misc.py file | annotate | diff | comparison | revisions
src/modules/publish/transaction.py file | annotate | diff | comparison | revisions
src/tests/api/t_api_search.py file | annotate | diff | comparison | revisions
src/tests/cli/t_pkg_search.py file | annotate | diff | comparison | revisions
src/tests/cli/t_pkg_temp_sources.py file | annotate | diff | comparison | revisions
src/tests/cli/t_pkgmerge.py file | annotate | diff | comparison | revisions 
--- a/src/modules/client/transport/transport.py	Thu Dec 08 03:41:17 2016 +0530
+++ b/src/modules/client/transport/transport.py	Thu Dec 08 03:41:19 2016 +0530
@@ -2633,7 +2633,7 @@
                         # i.e. if we have attributes:
                         # chain="a.a b.b c.c"
                         # chain.chash="aa bb cc" \
-                        #   pkg.chain.chash.sha256="AA BB CC"
+                        #   pkg.chain.chashes.sha512t_256="AA BB CC"
                         #
                         # and we're looking at file "b.b" then we must compare
                         # our computed value against the "BB" chash.
--- a/src/modules/digest.py	Thu Dec 08 03:41:17 2016 +0530
+++ b/src/modules/digest.py	Thu Dec 08 03:41:19 2016 +0530
@@ -114,7 +114,7 @@
 
 if PREFERRED_HASH != "sha1":
         DEFAULT_HASH_ATTRS.append("pkg.content-hash")
-        DEFAULT_CHASH_ATTRS.append("pkg.chash.{0}".format(PREFERRED_HASH))
+        DEFAULT_CHASH_ATTRS.append("pkg.content-hash")
         DEFAULT_GELF_HASH_ATTRS.append("pkg.content-hash")
         DEFAULT_CHAIN_ATTRS.append("pkg.chain.{0}".format(PREFERRED_HASH))
         DEFAULT_CHAIN_CHASH_ATTRS.append("pkg.chain.chashes.{0}".format(PREFERRED_HASH))
@@ -132,6 +132,7 @@
 
 EXTRACT_FILE = "file"
 EXTRACT_GELF = "gelf"
+EXTRACT_GZIP = "gzip"
 
 # In the dictionaries below, we map the action attributes to the name of the
 # class or factory-method that returns an object used to compute that attribute.
@@ -230,7 +231,7 @@
         """This class breaks out the stringified tuples from
         pkg.content-hash
 
-        	"extract_method:hash_alg:hash_val"
+        "extract_method:hash_alg:hash_val"
 
         into a dict with entries
 
@@ -251,7 +252,7 @@
         where 'hash_attr' is the preferred hash attribute name, 'hash_val'
         is the the preferred hash value, and 'hash_func' is the function
         used to compute the preferred hash based on the available
-        pkg.*hash.* attributes declared in the action."""
+        pkg.content-hash or pkg.*hash.* attributes declared in the action."""
 
         hash_attrs, hash_dic = _get_hash_dics(hash_type)
         if not (hash_attrs and hash_dic):
@@ -260,6 +261,8 @@
 
         if hash_type == HASH_GELF:
                 extract_method = EXTRACT_GELF
+        elif hash_type == CHASH:
+                extract_method = EXTRACT_GZIP
         else:
                 extract_method = EXTRACT_FILE
         if reversed:
@@ -281,8 +284,8 @@
                                 if attr in action.attrs:
                                         return (attr, action.attrs[attr],
                                             hash_dic[attr])
-                elif hash_type in (HASH, HASH_GELF):
-                        # Currently only HASH and HASH_GELF support
+                elif hash_type in (HASH, HASH_GELF, CHASH):
+                        # Currently only HASH, HASH_GELF and CHASH support
                         # pkg.content-hash.
                         ch_type = "{0}:{1}".format(extract_method, alg)
                         attr = "pkg.content-hash"
@@ -293,7 +296,7 @@
                                 if ch_type in ch:
                                         return (attr, ch[ch_type],
                                             hash_dic[ch_type])
-                elif hash_type in (CHASH, CHAIN, CHAIN_CHASH):
+                elif hash_type in (CHAIN, CHAIN_CHASH):
                         # The corresponding hash attr should be in the
                         # last position if sha2 or higher algorithm is enabled.
                         attr = hash_attrs[-1]
@@ -369,6 +372,8 @@
         hash_attrs, hash_dic = _get_hash_dics(hash_type)
         if hash_type == HASH_GELF:
                 extract_method = EXTRACT_GELF
+        elif hash_type == CHASH:
+                extract_method = EXTRACT_GZIP
         else:
                 extract_method = EXTRACT_FILE
 
@@ -391,8 +396,8 @@
                         new_hash = action.attrs.get(attr)
                         old_hash = old_action.attrs.get(attr)
                         return attr, new_hash, old_hash, hash_dic[attr]
-                elif hash_type in (HASH, HASH_GELF):
-                        # Currently only HASH and HASH_GELF support
+                elif hash_type in (HASH, HASH_GELF, CHASH):
+                        # Currently only HASH, HASH_GELF and CHASH support
                         # pkg.content-hash.
                         attr = "pkg.content-hash"
                         if attr not in all_hashes:
@@ -429,7 +434,7 @@
                                         old_hash = oh[ut]
 
                         return attr, new_hash, old_hash, hash_dic.get(ch_type)
-                elif hash_type in (CHASH, CHAIN, CHAIN_CHASH):
+                elif hash_type in (CHAIN, CHAIN_CHASH):
                         # The corresponding hash attr should be in the
                         # last position if sha2 or higher algorithm is enabled.
                         attr = hash_attrs[-1]
--- a/src/modules/misc.py	Thu Dec 08 03:41:17 2016 +0530
+++ b/src/modules/misc.py	Thu Dec 08 03:41:19 2016 +0530
@@ -696,7 +696,15 @@
 
         chashes = {}
         for chash_attr in chash_attrs:
-                chashes[chash_attr] = chash_algs[chash_attr]()
+                # "pkg.content-hash" is provided by default and doesn't
+                # indicate the hash_alg to be used, so when we want to
+                # calculate the content hash, we'll specify the
+                # hash_attrs explicitly, such as "gzip:sha512t_256".
+                if chash_attr == "pkg.content-hash":
+                        chashes[chash_attr] = chash_algs["{0}:{1}".format(
+                            digest.EXTRACT_GZIP, digest.PREFERRED_HASH)]()
+                else:
+                        chashes[chash_attr] = chash_algs[chash_attr]()
 
         #
         # This check prevents compressing a file which is already compressed.
@@ -736,7 +744,12 @@
                 fobj.close()
                 csize = str(fobj.size)
                 for attr in chashes:
-                        chashes[attr] = chashes[attr].hexdigest()
+                        if attr == "pkg.content-hash":
+                                chashes[attr] = "{0}:{1}:{2}".format(
+                                    digest.EXTRACT_GZIP, digest.PREFERRED_HASH,
+                                    chashes[attr].hexdigest())
+                        else:
+                                chashes[attr] = chashes[attr].hexdigest()
                 return csize, chashes
 
         # Compute the SHA hash of the compressed file.  In order for this to
@@ -759,7 +772,12 @@
         # The returned dictionary can now be populated with the hexdigests
         # instead of the hash objects themselves.
         for attr in chashes:
-                chashes[attr] = chashes[attr].hexdigest()
+                if attr == "pkg.content-hash":
+                        chashes[attr] = "{0}:{1}:{2}".format(
+                                digest.EXTRACT_GZIP, digest.PREFERRED_HASH,
+                                chashes[attr].hexdigest())
+                else:
+                        chashes[attr] = chashes[attr].hexdigest()
         return csize, chashes
 
 class ProcFS(object):
--- a/src/modules/publish/transaction.py	Thu Dec 08 03:41:17 2016 +0530
+++ b/src/modules/publish/transaction.py	Thu Dec 08 03:41:19 2016 +0530
@@ -496,7 +496,11 @@
                                 action.attrs[k] = v + action.attrlist(k)
                         else:
                                 action.attrs[k] = v
-                action.attrs.update(chashes)
+                for k, v in six.iteritems(chashes):
+                        if k == "pkg.content-hash":
+                                action.attrs[k] = action.attrlist(k) + [v]
+                        else:
+                                action.attrs[k] = v
                 action.attrs["pkg.csize"] = csize
 
         def add_file(self, pth, basename=None, progtrack=None):
--- a/src/tests/api/t_api_search.py	Thu Dec 08 03:41:17 2016 +0530
+++ b/src/tests/api/t_api_search.py	Thu Dec 08 03:41:19 2016 +0530
@@ -169,11 +169,11 @@
         ])
 
         res_remote_path = set([
-            ("pkg:/[email protected]", "basename","file a686473102ba73bd7920fc0ab1d97e00a24ed704 chash=f88920ce1f61db185d127ccb32dc8cf401ae7a83 group=bin mode=0555 owner=root path=bin/example_path pkg.chash.sha512t_256=98026acb06f550ed66c22b4314c3ca48a92fce49735aa4c61c5cb4330bb83b81 pkg.content-hash=file:sha512t_256:e4e6f08153d331ec9d342f9f52c512fcbb2c4b46d4b5e8de5640ae5fbe022011 pkg.csize=30 pkg.size=12"),
+            ("pkg:/[email protected]", "basename","file a686473102ba73bd7920fc0ab1d97e00a24ed704 chash=f88920ce1f61db185d127ccb32dc8cf401ae7a83 group=bin mode=0555 owner=root path=bin/example_path pkg.content-hash=file:sha512t_256:e4e6f08153d331ec9d342f9f52c512fcbb2c4b46d4b5e8de5640ae5fbe022011 pkg.content-hash=gzip:sha512t_256:98026acb06f550ed66c22b4314c3ca48a92fce49735aa4c61c5cb4330bb83b81 pkg.csize=30 pkg.size=12"),
         ])
 
         res_remote_path_of_example_path = set([
-            ("pkg:/[email protected]", "path","file a686473102ba73bd7920fc0ab1d97e00a24ed704 chash=f88920ce1f61db185d127ccb32dc8cf401ae7a83 group=bin mode=0555 owner=root path=bin/example_path pkg.chash.sha512t_256=98026acb06f550ed66c22b4314c3ca48a92fce49735aa4c61c5cb4330bb83b81 pkg.content-hash=file:sha512t_256:e4e6f08153d331ec9d342f9f52c512fcbb2c4b46d4b5e8de5640ae5fbe022011 pkg.csize=30 pkg.size=12")
+            ("pkg:/[email protected]", "path","file a686473102ba73bd7920fc0ab1d97e00a24ed704 chash=f88920ce1f61db185d127ccb32dc8cf401ae7a83 group=bin mode=0555 owner=root path=bin/example_path pkg.content-hash=file:sha512t_256:e4e6f08153d331ec9d342f9f52c512fcbb2c4b46d4b5e8de5640ae5fbe022011 pkg.content-hash=gzip:sha512t_256:98026acb06f550ed66c22b4314c3ca48a92fce49735aa4c61c5cb4330bb83b81 pkg.csize=30 pkg.size=12")
         ])
 
         res_remote_bin = set([
@@ -238,7 +238,7 @@
             remote_fmri_string,
             ('pkg:/[email protected]', 'path', 'dir group=bin mode=0755 owner=root path=bin/example_dir'),
             ('pkg:/[email protected]', 'basename', 'dir group=bin mode=0755 owner=root path=bin/example_dir'),
-            ('pkg:/[email protected]', 'path', 'file a686473102ba73bd7920fc0ab1d97e00a24ed704 chash=f88920ce1f61db185d127ccb32dc8cf401ae7a83 group=bin mode=0555 owner=root path=bin/example_path pkg.chash.sha512t_256=98026acb06f550ed66c22b4314c3ca48a92fce49735aa4c61c5cb4330bb83b81 pkg.content-hash=file:sha512t_256:e4e6f08153d331ec9d342f9f52c512fcbb2c4b46d4b5e8de5640ae5fbe022011 pkg.csize=30 pkg.size=12'),
+            ('pkg:/[email protected]', 'path', 'file a686473102ba73bd7920fc0ab1d97e00a24ed704 chash=f88920ce1f61db185d127ccb32dc8cf401ae7a83 group=bin mode=0555 owner=root path=bin/example_path pkg.content-hash=file:sha512t_256:e4e6f08153d331ec9d342f9f52c512fcbb2c4b46d4b5e8de5640ae5fbe022011 pkg.content-hash=gzip:sha512t_256:98026acb06f550ed66c22b4314c3ca48a92fce49735aa4c61c5cb4330bb83b81 pkg.csize=30 pkg.size=12'),
             ("pkg:/[email protected]", "mediator", "link mediator=example mediator-implementation=unladen-swallow mediator-version=7.0 path=bin/exlink target=/bin/example_path")
         ]) | res_remote_path
 
@@ -287,7 +287,7 @@
         res_local_openssl = copy.copy(res_remote_openssl)
 
         res_local_path_example11 = set([
-            ("pkg:/[email protected]", "basename", "file a686473102ba73bd7920fc0ab1d97e00a24ed704 chash=f88920ce1f61db185d127ccb32dc8cf401ae7a83 group=bin mode=0555 owner=root path=bin/example_path11 pkg.chash.sha512t_256=98026acb06f550ed66c22b4314c3ca48a92fce49735aa4c61c5cb4330bb83b81 pkg.content-hash=file:sha512t_256:e4e6f08153d331ec9d342f9f52c512fcbb2c4b46d4b5e8de5640ae5fbe022011 pkg.csize=30 pkg.size=12")
+            ("pkg:/[email protected]", "basename", "file a686473102ba73bd7920fc0ab1d97e00a24ed704 chash=f88920ce1f61db185d127ccb32dc8cf401ae7a83 group=bin mode=0555 owner=root path=bin/example_path11 pkg.content-hash=file:sha512t_256:e4e6f08153d331ec9d342f9f52c512fcbb2c4b46d4b5e8de5640ae5fbe022011 pkg.content-hash=gzip:sha512t_256:98026acb06f550ed66c22b4314c3ca48a92fce49735aa4c61c5cb4330bb83b81 pkg.csize=30 pkg.size=12")
         ])
 
         res_local_bin_example11 = set([
@@ -299,7 +299,7 @@
         ])
 
         res_local_wildcard_example11 = set([
-            ("pkg:/[email protected]", "basename", "file a686473102ba73bd7920fc0ab1d97e00a24ed704 chash=f88920ce1f61db185d127ccb32dc8cf401ae7a83 group=bin mode=0555 owner=root path=bin/example_path11 pkg.chash.sha512t_256=98026acb06f550ed66c22b4314c3ca48a92fce49735aa4c61c5cb4330bb83b81 pkg.content-hash=file:sha512t_256:e4e6f08153d331ec9d342f9f52c512fcbb2c4b46d4b5e8de5640ae5fbe022011 pkg.csize=30 pkg.size=12"),
+            ("pkg:/[email protected]", "basename", "file a686473102ba73bd7920fc0ab1d97e00a24ed704 chash=f88920ce1f61db185d127ccb32dc8cf401ae7a83 group=bin mode=0555 owner=root path=bin/example_path11 pkg.content-hash=file:sha512t_256:e4e6f08153d331ec9d342f9f52c512fcbb2c4b46d4b5e8de5640ae5fbe022011 pkg.content-hash=gzip:sha512t_256:98026acb06f550ed66c22b4314c3ca48a92fce49735aa4c61c5cb4330bb83b81 pkg.csize=30 pkg.size=12"),
         ]).union(res_local_pkg_example11)
 
         res_cat_pkg10 = set([
@@ -346,11 +346,11 @@
         ])).union(fat_10_fmri_string)
 
         res_space_with_star = set([
-            ('pkg:/[email protected]', 'basename', 'file a686473102ba73bd7920fc0ab1d97e00a24ed704 chash=f88920ce1f61db185d127ccb32dc8cf401ae7a83 group=sys mode=0444 owner=nobody path="unique/with a space" pkg.chash.sha512t_256=98026acb06f550ed66c22b4314c3ca48a92fce49735aa4c61c5cb4330bb83b81 pkg.content-hash=file:sha512t_256:e4e6f08153d331ec9d342f9f52c512fcbb2c4b46d4b5e8de5640ae5fbe022011 pkg.csize=30 pkg.size=12')
+            ('pkg:/[email protected]', 'basename', 'file a686473102ba73bd7920fc0ab1d97e00a24ed704 chash=f88920ce1f61db185d127ccb32dc8cf401ae7a83 group=sys mode=0444 owner=nobody path="unique/with a space" pkg.content-hash=file:sha512t_256:e4e6f08153d331ec9d342f9f52c512fcbb2c4b46d4b5e8de5640ae5fbe022011 pkg.content-hash=gzip:sha512t_256:98026acb06f550ed66c22b4314c3ca48a92fce49735aa4c61c5cb4330bb83b81 pkg.csize=30 pkg.size=12')
         ])
 
         res_space_space_star = set([
-            ('pkg:/[email protected]', 'basename', 'file a686473102ba73bd7920fc0ab1d97e00a24ed704 chash=f88920ce1f61db185d127ccb32dc8cf401ae7a83 group=sys mode=0444 owner=nobody path="unique/with a space" pkg.chash.sha512t_256=98026acb06f550ed66c22b4314c3ca48a92fce49735aa4c61c5cb4330bb83b81 pkg.content-hash=file:sha512t_256:e4e6f08153d331ec9d342f9f52c512fcbb2c4b46d4b5e8de5640ae5fbe022011 pkg.csize=30 pkg.size=12'), ('pkg:/[email protected]', 'path', 'file a686473102ba73bd7920fc0ab1d97e00a24ed704 chash=f88920ce1f61db185d127ccb32dc8cf401ae7a83 group=sys mode=0444 owner=nobody path="unique/with a space" pkg.chash.sha512t_256=98026acb06f550ed66c22b4314c3ca48a92fce49735aa4c61c5cb4330bb83b81 pkg.content-hash=file:sha512t_256:e4e6f08153d331ec9d342f9f52c512fcbb2c4b46d4b5e8de5640ae5fbe022011 pkg.csize=30 pkg.size=12')
+            ('pkg:/[email protected]', 'basename', 'file a686473102ba73bd7920fc0ab1d97e00a24ed704 chash=f88920ce1f61db185d127ccb32dc8cf401ae7a83 group=sys mode=0444 owner=nobody path="unique/with a space" pkg.content-hash=file:sha512t_256:e4e6f08153d331ec9d342f9f52c512fcbb2c4b46d4b5e8de5640ae5fbe022011 pkg.content-hash=gzip:sha512t_256:98026acb06f550ed66c22b4314c3ca48a92fce49735aa4c61c5cb4330bb83b81 pkg.csize=30 pkg.size=12'), ('pkg:/[email protected]', 'path', 'file a686473102ba73bd7920fc0ab1d97e00a24ed704 chash=f88920ce1f61db185d127ccb32dc8cf401ae7a83 group=sys mode=0444 owner=nobody path="unique/with a space" pkg.content-hash=file:sha512t_256:e4e6f08153d331ec9d342f9f52c512fcbb2c4b46d4b5e8de5640ae5fbe022011 pkg.content-hash=gzip:sha512t_256:98026acb06f550ed66c22b4314c3ca48a92fce49735aa4c61c5cb4330bb83b81 pkg.csize=30 pkg.size=12')
         ])
 
         res_space_unique = set([
@@ -398,7 +398,7 @@
 
         res_bug_983 = set([
             ("pkg:/[email protected]", "basename", "link path=usr/sfw/bin/gmake target=../../bin/gmake"),
-            ('pkg:/[email protected]', 'basename', 'file 038cc7a09940928aeac6966331a2f18bc40e7792 chash=a3e76bd1b97b715cddc93b2ad6502b41efa4d833 elfarch=i386 elfbits=32 elfhash=083308992c921537fd757548964f89452234dd11 group=bin mode=0555 owner=root path=usr/bin/gmake pkg.chash.sha512t_256=17e38c279aad2c4877618246cb60cb4c795f6754880649c56d847e653fadd71c pkg.content-hash=gelf:sha512t_256:d83d7d72909d64b455da54095f65b6f36917c53be456d61740dd83d98f0c6c4e pkg.content-hash=gelf.unsigned:sha512t_256:d83d7d72909d64b455da54095f65b6f36917c53be456d61740dd83d98f0c6c4e pkg.content-hash=file:sha512t_256:2374db2dfb4968baad246ab37afc560cc9d278b6104a889a2727d9bcf6a20b17 pkg.csize=1358 pkg.size=3948'),
+            ('pkg:/[email protected]', 'basename', 'file 038cc7a09940928aeac6966331a2f18bc40e7792 chash=a3e76bd1b97b715cddc93b2ad6502b41efa4d833 elfarch=i386 elfbits=32 elfhash=083308992c921537fd757548964f89452234dd11 group=bin mode=0555 owner=root path=usr/bin/gmake pkg.content-hash=gelf:sha512t_256:d83d7d72909d64b455da54095f65b6f36917c53be456d61740dd83d98f0c6c4e pkg.content-hash=gelf.unsigned:sha512t_256:d83d7d72909d64b455da54095f65b6f36917c53be456d61740dd83d98f0c6c4e pkg.content-hash=file:sha512t_256:2374db2dfb4968baad246ab37afc560cc9d278b6104a889a2727d9bcf6a20b17 pkg.content-hash=gzip:sha512t_256:17e38c279aad2c4877618246cb60cb4c795f6754880649c56d847e653fadd71c pkg.csize=1358 pkg.size=3948'),
             ('pkg:/[email protected]', 'gmake - GNU make', 'set name=description value="gmake - GNU make"')
         ])
 
@@ -428,8 +428,8 @@
              "file a686473102ba73bd7920fc0ab1d97e00a24ed704 "
              "chash=f88920ce1f61db185d127ccb32dc8cf401ae7a83 group=bin "
              "mode=0555 owner=root path=bin/example_path "
-             "pkg.chash.sha512t_256=98026acb06f550ed66c22b4314c3ca48a92fce49735aa4c61c5cb4330bb83b81 "
              "pkg.content-hash=file:sha512t_256:e4e6f08153d331ec9d342f9f52c512fcbb2c4b46d4b5e8de5640ae5fbe022011 "
+             "pkg.content-hash=gzip:sha512t_256:98026acb06f550ed66c22b4314c3ca48a92fce49735aa4c61c5cb4330bb83b81 "
              "pkg.csize=30 "
              "pkg.size=12"),
             ("pkg:/[email protected]",
@@ -437,8 +437,8 @@
              "file a686473102ba73bd7920fc0ab1d97e00a24ed704 "
              "chash=f88920ce1f61db185d127ccb32dc8cf401ae7a83 group=bin "
              "mode=0555 owner=root path=bin/example_path "
-             "pkg.chash.sha512t_256=98026acb06f550ed66c22b4314c3ca48a92fce49735aa4c61c5cb4330bb83b81 "
              "pkg.content-hash=file:sha512t_256:e4e6f08153d331ec9d342f9f52c512fcbb2c4b46d4b5e8de5640ae5fbe022011 "
+             "pkg.content-hash=gzip:sha512t_256:98026acb06f550ed66c22b4314c3ca48a92fce49735aa4c61c5cb4330bb83b81 "
              "pkg.csize=30 "
              "pkg.size=12"),
              ("pkg:/[email protected]",
@@ -446,8 +446,8 @@
              "file a686473102ba73bd7920fc0ab1d97e00a24ed704 "
              "chash=f88920ce1f61db185d127ccb32dc8cf401ae7a83 group=bin "
              "mode=0555 owner=root path=bin/example_path "
-             "pkg.chash.sha512t_256=98026acb06f550ed66c22b4314c3ca48a92fce49735aa4c61c5cb4330bb83b81 "
              "pkg.content-hash=file:sha512t_256:e4e6f08153d331ec9d342f9f52c512fcbb2c4b46d4b5e8de5640ae5fbe022011 "
+             "pkg.content-hash=gzip:sha512t_256:98026acb06f550ed66c22b4314c3ca48a92fce49735aa4c61c5cb4330bb83b81 "
              "pkg.csize=30 "
              "pkg.size=12"),
             ("pkg:/[email protected]",
@@ -455,8 +455,8 @@
              "file a686473102ba73bd7920fc0ab1d97e00a24ed704 "
              "chash=f88920ce1f61db185d127ccb32dc8cf401ae7a83 group=bin "
              "mode=0555 owner=root path=bin/example_path "
-             "pkg.chash.sha512t_256=98026acb06f550ed66c22b4314c3ca48a92fce49735aa4c61c5cb4330bb83b81 "
              "pkg.content-hash=file:sha512t_256:e4e6f08153d331ec9d342f9f52c512fcbb2c4b46d4b5e8de5640ae5fbe022011 "
+             "pkg.content-hash=gzip:sha512t_256:98026acb06f550ed66c22b4314c3ca48a92fce49735aa4c61c5cb4330bb83b81 "
              "pkg.csize=30 "
              "pkg.size=12")
         ]) | res_remote_path
@@ -473,8 +473,8 @@
              "file a686473102ba73bd7920fc0ab1d97e00a24ed704 "
              "chash=f88920ce1f61db185d127ccb32dc8cf401ae7a83 group=bin "
              "mode=0555 owner=root path=bin/example_path "
-             "pkg.chash.sha512t_256=98026acb06f550ed66c22b4314c3ca48a92fce49735aa4c61c5cb4330bb83b81 "
              "pkg.content-hash=file:sha512t_256:e4e6f08153d331ec9d342f9f52c512fcbb2c4b46d4b5e8de5640ae5fbe022011 "
+             "pkg.content-hash=gzip:sha512t_256:98026acb06f550ed66c22b4314c3ca48a92fce49735aa4c61c5cb4330bb83b81 "
              "pkg.csize=30 "
              "pkg.size=12"),
             ("pkg:/[email protected]",
@@ -482,8 +482,8 @@
              "file a686473102ba73bd7920fc0ab1d97e00a24ed704 "
              "chash=f88920ce1f61db185d127ccb32dc8cf401ae7a83 group=bin "
              "mode=0555 owner=root path=bin/example_path "
-             "pkg.chash.sha512t_256=98026acb06f550ed66c22b4314c3ca48a92fce49735aa4c61c5cb4330bb83b81 "
              "pkg.content-hash=file:sha512t_256:e4e6f08153d331ec9d342f9f52c512fcbb2c4b46d4b5e8de5640ae5fbe022011 "
+             "pkg.content-hash=gzip:sha512t_256:98026acb06f550ed66c22b4314c3ca48a92fce49735aa4c61c5cb4330bb83b81 "
              "pkg.csize=30 "
              "pkg.size=12"),
             ("pkg:/[email protected]",
@@ -491,8 +491,8 @@
              "file a686473102ba73bd7920fc0ab1d97e00a24ed704 "
              "chash=f88920ce1f61db185d127ccb32dc8cf401ae7a83 group=bin "
              "mode=0555 owner=root path=bin/example_path "
-             "pkg.chash.sha512t_256=98026acb06f550ed66c22b4314c3ca48a92fce49735aa4c61c5cb4330bb83b81 "
              "pkg.content-hash=file:sha512t_256:e4e6f08153d331ec9d342f9f52c512fcbb2c4b46d4b5e8de5640ae5fbe022011 "
+             "pkg.content-hash=gzip:sha512t_256:98026acb06f550ed66c22b4314c3ca48a92fce49735aa4c61c5cb4330bb83b81 "
              "pkg.csize=30 "
              "pkg.size=12"),
             ("pkg:/[email protected]",
@@ -500,8 +500,8 @@
             "file a686473102ba73bd7920fc0ab1d97e00a24ed704 "
             "chash=f88920ce1f61db185d127ccb32dc8cf401ae7a83 group=bin "
             "mode=0555 owner=root path=bin/example_path "
-            "pkg.chash.sha512t_256=98026acb06f550ed66c22b4314c3ca48a92fce49735aa4c61c5cb4330bb83b81 "
             "pkg.content-hash=file:sha512t_256:e4e6f08153d331ec9d342f9f52c512fcbb2c4b46d4b5e8de5640ae5fbe022011 "
+            "pkg.content-hash=gzip:sha512t_256:98026acb06f550ed66c22b4314c3ca48a92fce49735aa4c61c5cb4330bb83b81 "
             "pkg.csize=30 "
             "pkg.size=12"),
             ("pkg:/[email protected]",
@@ -509,8 +509,8 @@
              "file a686473102ba73bd7920fc0ab1d97e00a24ed704 "
              "chash=f88920ce1f61db185d127ccb32dc8cf401ae7a83 group=bin "
              "mode=0555 owner=root path=bin/example_path "
-             "pkg.chash.sha512t_256=98026acb06f550ed66c22b4314c3ca48a92fce49735aa4c61c5cb4330bb83b81 "
              "pkg.content-hash=file:sha512t_256:e4e6f08153d331ec9d342f9f52c512fcbb2c4b46d4b5e8de5640ae5fbe022011 "
+             "pkg.content-hash=gzip:sha512t_256:98026acb06f550ed66c22b4314c3ca48a92fce49735aa4c61c5cb4330bb83b81 "
              "pkg.csize=30 "
              "pkg.size=12")
         ])
--- a/src/tests/cli/t_pkg_search.py	Thu Dec 08 03:41:17 2016 +0530
+++ b/src/tests/cli/t_pkg_search.py	Thu Dec 08 03:41:19 2016 +0530
@@ -302,7 +302,7 @@
         res_remote_file = set([
             'path       file      bin/example_path          pkg:/[email protected]\n',
             'b40981aab75932c5b2f555f50769d878e44913d7 file      bin/example_path          pkg:/[email protected]\n',
-            'pkg.content-hash file   file:sha512t_256:8e3b2cea6dc6c4954cf8205bff833ead1f2eb3d4850525544cde0242c971452d pkg:/[email protected]\n',
+            "pkg.content-hash file   ['file:sha512t_256:8e3b2cea6dc6c4954cf8205bff833ead1f2eb3d4850525544cde0242c971452d', 'gzip:sha512t_256:8846fa174b11c8241080d58796509ef3f86f1dba119f318d32e5ca1b2be33f91'] pkg:/[email protected]\n",
             'hash                                     file   bin/example_path pkg:/[email protected]\n'
         ]) | res_remote_path
 
@@ -317,7 +317,7 @@
              'path       file      bin/example_path          pkg:/[email protected]\n',
              'basename   file      bin/example_path          pkg:/[email protected]\n',
              'b40981aab75932c5b2f555f50769d878e44913d7 file      bin/example_path          pkg:/[email protected]\n',
-             'pkg.content-hash file   file:sha512t_256:8e3b2cea6dc6c4954cf8205bff833ead1f2eb3d4850525544cde0242c971452d pkg:/[email protected]\n',
+             "pkg.content-hash file   ['file:sha512t_256:8e3b2cea6dc6c4954cf8205bff833ead1f2eb3d4850525544cde0242c971452d', 'gzip:sha512t_256:8846fa174b11c8241080d58796509ef3f86f1dba119f318d32e5ca1b2be33f91'] pkg:/[email protected]\n",
              'hash                                     file   bin/example_path pkg:/[email protected]\n'
         ])
 
@@ -331,7 +331,7 @@
             "file bin/example_path example_pkg " \
             "pkg:/[email protected] bin/example_path " \
             "basename 0555 root bin " \
-            "file b40981aab75932c5b2f555f50769d878e44913d7 chash=6a4299897fca0c4d0d18870da29a0dc7ae23b79c group=bin mode=0555 owner=root path=bin/example_path pkg.chash.sha512t_256=8846fa174b11c8241080d58796509ef3f86f1dba119f318d32e5ca1b2be33f91 pkg.content-hash=file:sha512t_256:8e3b2cea6dc6c4954cf8205bff833ead1f2eb3d4850525544cde0242c971452d pkg.csize=25 pkg.size=5\n"
+            "file b40981aab75932c5b2f555f50769d878e44913d7 chash=6a4299897fca0c4d0d18870da29a0dc7ae23b79c group=bin mode=0555 owner=root path=bin/example_path pkg.content-hash=file:sha512t_256:8e3b2cea6dc6c4954cf8205bff833ead1f2eb3d4850525544cde0242c971452d pkg.content-hash=gzip:sha512t_256:8846fa174b11c8241080d58796509ef3f86f1dba119f318d32e5ca1b2be33f91 pkg.csize=25 pkg.size=5\n"
 
         o_results = o_results_no_pub.rstrip() + " test\n"
 
--- a/src/tests/cli/t_pkg_temp_sources.py	Thu Dec 08 03:41:17 2016 +0530
+++ b/src/tests/cli/t_pkg_temp_sources.py	Thu Dec 08 03:41:19 2016 +0530
@@ -648,11 +648,11 @@
 dir group=bin mode=0755 owner=root path=usr/share/doc/foo
 dir group=bin mode=0755 owner=root path=usr/share/man
 dir group=bin mode=0755 owner=root path=usr/share/man/man1
-file 0acf1107d31f3bab406f8611b21b8fade78ac874 chash=20db00fbd7c9fb551e54c5b424bf24d48cf81b7a facet.doc.man=true group=bin mode=0444 owner=root path=usr/share/man/man1/foo.1 pkg.chash.sha512t_256=8ad08d18cca04a1158c61ac639753dd121995003ac43b02b9f7c376707d65cd0 pkg.content-hash=file:sha512t_256:e69992abd1e29729ab4e2de438b1b34512b8b51a046df161ff9881f242ac4b74 pkg.csize=29 pkg.size=9
-file b265f2ec87c4a55eb2b6b4c926e7c65f7247a27e chash=5ae38559680146c49d647163ac2f60cdf43e20d8 group=bin mode=0755 owner=root path=usr/bin/foo pkg.chash.sha512t_256=966a4409b8b727a6ab92f6b643f443a2e5c81d88b551a12e855e298c4de36f65 pkg.content-hash=file:sha512t_256:7b9fa8c90af00a3254b68cdbb706f51df42a5799cff9c90c7daf2e2ab639fd9b pkg.csize=27 pkg.size=7
-file 4ea0699d20b99238a877051e50406687fd4fe163 chash=7a23120f5a4f1eae2829a707020d0cdbab10e9a2 group=bin mode=0755 owner=root path=lib/libfoo.so.1 pkg.chash.sha512t_256=841f9332ea7747539505e654d6b6c3d25be17146a5292935cb210dce8b347751 pkg.content-hash=file:sha512t_256:4645c47cd437dfa73bbcc76f6db16af476dae6140e6b81f4dd60d31a1151ad9e pkg.csize=41 pkg.size=21 variant.debug.foo=true
-file a285ada5f3cae14ea00e97a8d99bd3e357cb0dca chash=97a09a2356d068d8dbe418de90012908c095d3e2 group=bin mode=0755 owner=root path=lib/libfoo.so.1 pkg.chash.sha512t_256=2445c83442edd57f62f35bf08513d6e4c280e6658a3e416d63d874d1f972af7f pkg.content-hash=file:sha512t_256:fbac79d5061f2fb4d29ac99cd1de5c982617e67f956f12be2ca330ba159c6e02 pkg.csize=35 pkg.size=15 variant.debug.foo=false
-file dc84bd4b606fe43fc892eb245d9602b67f8cba38 chash=e1106f9505253dfe46aa48c353740f9e1896a844 group=bin mode=0444 owner=root path=usr/share/doc/foo/README pkg.chash.sha512t_256=6e0d5f8b106123b129276a38cf3b8822abc91c5b291ba3e51b4854ba6218ab6d pkg.content-hash=file:sha512t_256:f57d0e3a47386f7ec82828ac86781a39e5e1763c9d8f013fdce0ca642b80e1d5 pkg.csize=30 pkg.size=10
+file 0acf1107d31f3bab406f8611b21b8fade78ac874 chash=20db00fbd7c9fb551e54c5b424bf24d48cf81b7a facet.doc.man=true group=bin mode=0444 owner=root path=usr/share/man/man1/foo.1 pkg.content-hash=file:sha512t_256:e69992abd1e29729ab4e2de438b1b34512b8b51a046df161ff9881f242ac4b74 pkg.content-hash=gzip:sha512t_256:8ad08d18cca04a1158c61ac639753dd121995003ac43b02b9f7c376707d65cd0 pkg.csize=29 pkg.size=9
+file b265f2ec87c4a55eb2b6b4c926e7c65f7247a27e chash=5ae38559680146c49d647163ac2f60cdf43e20d8 group=bin mode=0755 owner=root path=usr/bin/foo pkg.content-hash=file:sha512t_256:7b9fa8c90af00a3254b68cdbb706f51df42a5799cff9c90c7daf2e2ab639fd9b pkg.content-hash=gzip:sha512t_256:966a4409b8b727a6ab92f6b643f443a2e5c81d88b551a12e855e298c4de36f65 pkg.csize=27 pkg.size=7
+file 4ea0699d20b99238a877051e50406687fd4fe163 chash=7a23120f5a4f1eae2829a707020d0cdbab10e9a2 group=bin mode=0755 owner=root path=lib/libfoo.so.1 pkg.content-hash=file:sha512t_256:4645c47cd437dfa73bbcc76f6db16af476dae6140e6b81f4dd60d31a1151ad9e pkg.content-hash=gzip:sha512t_256:841f9332ea7747539505e654d6b6c3d25be17146a5292935cb210dce8b347751 pkg.csize=41 pkg.size=21 variant.debug.foo=true
+file a285ada5f3cae14ea00e97a8d99bd3e357cb0dca chash=97a09a2356d068d8dbe418de90012908c095d3e2 group=bin mode=0755 owner=root path=lib/libfoo.so.1 pkg.content-hash=file:sha512t_256:fbac79d5061f2fb4d29ac99cd1de5c982617e67f956f12be2ca330ba159c6e02 pkg.content-hash=gzip:sha512t_256:2445c83442edd57f62f35bf08513d6e4c280e6658a3e416d63d874d1f972af7f pkg.csize=35 pkg.size=15 variant.debug.foo=false
+file dc84bd4b606fe43fc892eb245d9602b67f8cba38 chash=e1106f9505253dfe46aa48c353740f9e1896a844 group=bin mode=0444 owner=root path=usr/share/doc/foo/README pkg.content-hash=file:sha512t_256:f57d0e3a47386f7ec82828ac86781a39e5e1763c9d8f013fdce0ca642b80e1d5 pkg.content-hash=gzip:sha512t_256:6e0d5f8b106123b129276a38cf3b8822abc91c5b291ba3e51b4854ba6218ab6d pkg.csize=30 pkg.size=10
 hardlink path=usr/local/bin/hard-foo target=/usr/bin/foo
 link path=usr/local/bin/soft-foo target=usr/bin/foo
 """ % self.foo10
--- a/src/tests/cli/t_pkgmerge.py	Thu Dec 08 03:41:17 2016 +0530
+++ b/src/tests/cli/t_pkgmerge.py	Thu Dec 08 03:41:19 2016 +0530
@@ -488,13 +488,13 @@
 depend fmri=pkg:/[email protected] type=require
 dir group=bin mode=0755 owner=root path=etc
 dir group=bin mode=0755 owner=root path=lib
-file 05fbc66156a145a81f2985a65988519ffd6bffc6 chash=e22205864f82cf4f25885280135d076bf90f0fd0 group=bin mode=0555 owner=root path=usr/bin/sh pkg.chash.sha512t_256=f0d3ea47ad14f4d1e3df4c33f46d8e7ccba820d2e70ade8542dbf1f17120f2a4 pkg.content-hash=file:sha512t_256:96089d2295ac184fc226c6fd195ba46b8bcd7eaae68ab16de2cb7f505404219a pkg.csize=26 pkg.size=6
-file 5ae4f5f38ad6830ce0f163e5bf925e7a22be8d1d chash=2f4af72b2265bf0c894b18067357d811c3b27c67 group=bin mode=0444 owner=root path=A1/B2/C3/D4/E5/F6/bronzeA2 pkg.chash.sha512t_256=a6e32c459da3aa0d50b89925d1cbc6db9963a8c714e873910ad25ed1c9a73e99 pkg.content-hash=file:sha512t_256:0b00671dcb481fb77388607f5aaa3f90d908f3504d973b041bb220840c6f7450 pkg.csize=32 pkg.size=12
-file 8264e757d4a4d8e2108a26b32edbf0412229b4d6 chash=9f0d43e4d39acd2c97a1ba8e86f3afce4d265757 group=bin mode=0444 owner=root path=etc/scheme pkg.chash.sha512t_256=cff221470e59a3520f3b9b89d8172bc706aa3af3f34aa5e7c706de144f73e78e pkg.content-hash=file:sha512t_256:d0f429df54df78c3ef31adebf47a14804598c1205531822d0571fd78dbd6fe82 pkg.csize=30 pkg.size=10
-file 8535c15c49cbe1e7cb1a0bf8ff87e512abed66f8 chash=6ff2f52d2f894f5c71fb8fdd3b214e22959fccbb group=bin mode=0555 owner=root path=lib/libc.bronze pkg.chash.sha512t_256=a43a748d42d29549dce338f2e8104e95718cc19438d9a17aee78239c9349a89a pkg.content-hash=file:sha512t_256:30d1f2a7e683a2a7049217876a72dca7f782a2cac043548abe536bcd06d9ea6b pkg.csize=33 pkg.size=13
-file a268afd7e6131a2273314b397dd6232827b6152b chash=2e7390833be180b7373d90884ec1e45bd1edfa92 group=bin mode=0444 owner=root path=etc/bronze1 pkg.chash.sha512t_256=0d1778a9de63da3e3573fd374b493d5c1abfb024587a81c7f8cf51944aa36414 pkg.content-hash=file:sha512t_256:8856f57818f25706d3a8a2d98d024c1185e11a2c6149e0b95811f4b41b7a9b74 pkg.csize=31 pkg.size=11
+file 05fbc66156a145a81f2985a65988519ffd6bffc6 chash=e22205864f82cf4f25885280135d076bf90f0fd0 group=bin mode=0555 owner=root path=usr/bin/sh pkg.content-hash=file:sha512t_256:96089d2295ac184fc226c6fd195ba46b8bcd7eaae68ab16de2cb7f505404219a pkg.content-hash=gzip:sha512t_256:f0d3ea47ad14f4d1e3df4c33f46d8e7ccba820d2e70ade8542dbf1f17120f2a4 pkg.csize=26 pkg.size=6
+file 5ae4f5f38ad6830ce0f163e5bf925e7a22be8d1d chash=2f4af72b2265bf0c894b18067357d811c3b27c67 group=bin mode=0444 owner=root path=A1/B2/C3/D4/E5/F6/bronzeA2 pkg.content-hash=file:sha512t_256:0b00671dcb481fb77388607f5aaa3f90d908f3504d973b041bb220840c6f7450 pkg.content-hash=gzip:sha512t_256:a6e32c459da3aa0d50b89925d1cbc6db9963a8c714e873910ad25ed1c9a73e99 pkg.csize=32 pkg.size=12
+file 8264e757d4a4d8e2108a26b32edbf0412229b4d6 chash=9f0d43e4d39acd2c97a1ba8e86f3afce4d265757 group=bin mode=0444 owner=root path=etc/scheme pkg.content-hash=file:sha512t_256:d0f429df54df78c3ef31adebf47a14804598c1205531822d0571fd78dbd6fe82 pkg.content-hash=gzip:sha512t_256:cff221470e59a3520f3b9b89d8172bc706aa3af3f34aa5e7c706de144f73e78e pkg.csize=30 pkg.size=10
+file 8535c15c49cbe1e7cb1a0bf8ff87e512abed66f8 chash=6ff2f52d2f894f5c71fb8fdd3b214e22959fccbb group=bin mode=0555 owner=root path=lib/libc.bronze pkg.content-hash=file:sha512t_256:30d1f2a7e683a2a7049217876a72dca7f782a2cac043548abe536bcd06d9ea6b pkg.content-hash=gzip:sha512t_256:a43a748d42d29549dce338f2e8104e95718cc19438d9a17aee78239c9349a89a pkg.csize=33 pkg.size=13
+file a268afd7e6131a2273314b397dd6232827b6152b chash=2e7390833be180b7373d90884ec1e45bd1edfa92 group=bin mode=0444 owner=root path=etc/bronze1 pkg.content-hash=file:sha512t_256:8856f57818f25706d3a8a2d98d024c1185e11a2c6149e0b95811f4b41b7a9b74 pkg.content-hash=gzip:sha512t_256:0d1778a9de63da3e3573fd374b493d5c1abfb024587a81c7f8cf51944aa36414 pkg.csize=31 pkg.size=11
 hardlink path=lib/libc.bronze2.0.hardlink target=/lib/libc.so.1
-license 995ad376b9c7ae79d67e673504fc4199fbfb32eb chash=9374d402ed3034a553119e179d0ae00386bb5206 license=copyright pkg.chash.sha512t_256=e4307a4d5a00e471c9adf331c2c29e00585102e2cc55d454558551aafb02eb63 pkg.content-hash=file:sha512t_256:465c63a3f18339bc1a1bda910720d697e58b9144303dbd2ad9a9ba3e30b87994 pkg.csize=34 pkg.size=14
+license 995ad376b9c7ae79d67e673504fc4199fbfb32eb chash=9374d402ed3034a553119e179d0ae00386bb5206 license=copyright pkg.content-hash=file:sha512t_256:465c63a3f18339bc1a1bda910720d697e58b9144303dbd2ad9a9ba3e30b87994 pkg.content-hash=gzip:sha512t_256:e4307a4d5a00e471c9adf331c2c29e00585102e2cc55d454558551aafb02eb63 pkg.csize=34 pkg.size=14
 link path=usr/bin/jsh target=./sh
 set name=pkg.fmri value={0}
 set name=variant.arch value=i386\
@@ -615,25 +615,25 @@
 depend fmri=pkg:/[email protected] type=require variant.arch=i386
 dir group=bin mode=0755 owner=root path=etc
 dir group=bin mode=0755 owner=root path=lib
-file 058b358a95c4417cb6d68eb9e37f41c063e03892 chash=69d518d352b7406393903e41f6316a01c13c53f9 group=bin mode=0444 owner=root path=etc/amber2 pkg.chash.sha512t_256=11771a626d87feca3f2b4436d992636526ca1aa7afc98e4d77a8c32fbb50896f pkg.content-hash=file:sha512t_256:8f4b3ca9e6d12d10c937b85ccdea8d7f26f1019576388612fa86f5d610510e21 pkg.csize=31 pkg.size=11 variant.arch=sparc
-file 05fbc66156a145a81f2985a65988519ffd6bffc6 chash=e22205864f82cf4f25885280135d076bf90f0fd0 group=bin mode=0555 owner=root path=usr/bin/sh pkg.chash.sha512t_256=f0d3ea47ad14f4d1e3df4c33f46d8e7ccba820d2e70ade8542dbf1f17120f2a4 pkg.content-hash=file:sha512t_256:96089d2295ac184fc226c6fd195ba46b8bcd7eaae68ab16de2cb7f505404219a pkg.csize=26 pkg.size=6
-file 5ae4f5f38ad6830ce0f163e5bf925e7a22be8d1d chash=2f4af72b2265bf0c894b18067357d811c3b27c67 group=bin mode=0444 owner=root path=A1/B2/C3/D4/E5/F6/bronzeA2 pkg.chash.sha512t_256=a6e32c459da3aa0d50b89925d1cbc6db9963a8c714e873910ad25ed1c9a73e99 pkg.content-hash=file:sha512t_256:0b00671dcb481fb77388607f5aaa3f90d908f3504d973b041bb220840c6f7450 pkg.csize=32 pkg.size=12
-file 8264e757d4a4d8e2108a26b32edbf0412229b4d6 chash=9f0d43e4d39acd2c97a1ba8e86f3afce4d265757 group=bin mode=0444 owner=root path=etc/scheme pkg.chash.sha512t_256=cff221470e59a3520f3b9b89d8172bc706aa3af3f34aa5e7c706de144f73e78e pkg.content-hash=file:sha512t_256:d0f429df54df78c3ef31adebf47a14804598c1205531822d0571fd78dbd6fe82 pkg.csize=30 pkg.size=10 variant.arch=i386
-file 8535c15c49cbe1e7cb1a0bf8ff87e512abed66f8 chash=6ff2f52d2f894f5c71fb8fdd3b214e22959fccbb group=bin mode=0555 owner=root path=lib/libc.bronze pkg.chash.sha512t_256=a43a748d42d29549dce338f2e8104e95718cc19438d9a17aee78239c9349a89a pkg.content-hash=file:sha512t_256:30d1f2a7e683a2a7049217876a72dca7f782a2cac043548abe536bcd06d9ea6b pkg.csize=33 pkg.size=13
-file a268afd7e6131a2273314b397dd6232827b6152b chash=2e7390833be180b7373d90884ec1e45bd1edfa92 group=bin mode=0444 owner=root path=etc/bronze1 pkg.chash.sha512t_256=0d1778a9de63da3e3573fd374b493d5c1abfb024587a81c7f8cf51944aa36414 pkg.content-hash=file:sha512t_256:8856f57818f25706d3a8a2d98d024c1185e11a2c6149e0b95811f4b41b7a9b74 pkg.csize=31 pkg.size=11
+file 058b358a95c4417cb6d68eb9e37f41c063e03892 chash=69d518d352b7406393903e41f6316a01c13c53f9 group=bin mode=0444 owner=root path=etc/amber2 pkg.content-hash=file:sha512t_256:8f4b3ca9e6d12d10c937b85ccdea8d7f26f1019576388612fa86f5d610510e21 pkg.content-hash=gzip:sha512t_256:11771a626d87feca3f2b4436d992636526ca1aa7afc98e4d77a8c32fbb50896f pkg.csize=31 pkg.size=11 variant.arch=sparc
+file 05fbc66156a145a81f2985a65988519ffd6bffc6 chash=e22205864f82cf4f25885280135d076bf90f0fd0 group=bin mode=0555 owner=root path=usr/bin/sh pkg.content-hash=file:sha512t_256:96089d2295ac184fc226c6fd195ba46b8bcd7eaae68ab16de2cb7f505404219a pkg.content-hash=gzip:sha512t_256:f0d3ea47ad14f4d1e3df4c33f46d8e7ccba820d2e70ade8542dbf1f17120f2a4 pkg.csize=26 pkg.size=6
+file 5ae4f5f38ad6830ce0f163e5bf925e7a22be8d1d chash=2f4af72b2265bf0c894b18067357d811c3b27c67 group=bin mode=0444 owner=root path=A1/B2/C3/D4/E5/F6/bronzeA2 pkg.content-hash=file:sha512t_256:0b00671dcb481fb77388607f5aaa3f90d908f3504d973b041bb220840c6f7450 pkg.content-hash=gzip:sha512t_256:a6e32c459da3aa0d50b89925d1cbc6db9963a8c714e873910ad25ed1c9a73e99 pkg.csize=32 pkg.size=12
+file 8264e757d4a4d8e2108a26b32edbf0412229b4d6 chash=9f0d43e4d39acd2c97a1ba8e86f3afce4d265757 group=bin mode=0444 owner=root path=etc/scheme pkg.content-hash=file:sha512t_256:d0f429df54df78c3ef31adebf47a14804598c1205531822d0571fd78dbd6fe82 pkg.content-hash=gzip:sha512t_256:cff221470e59a3520f3b9b89d8172bc706aa3af3f34aa5e7c706de144f73e78e pkg.csize=30 pkg.size=10 variant.arch=i386
+file 8535c15c49cbe1e7cb1a0bf8ff87e512abed66f8 chash=6ff2f52d2f894f5c71fb8fdd3b214e22959fccbb group=bin mode=0555 owner=root path=lib/libc.bronze pkg.content-hash=file:sha512t_256:30d1f2a7e683a2a7049217876a72dca7f782a2cac043548abe536bcd06d9ea6b pkg.content-hash=gzip:sha512t_256:a43a748d42d29549dce338f2e8104e95718cc19438d9a17aee78239c9349a89a pkg.csize=33 pkg.size=13
+file a268afd7e6131a2273314b397dd6232827b6152b chash=2e7390833be180b7373d90884ec1e45bd1edfa92 group=bin mode=0444 owner=root path=etc/bronze1 pkg.content-hash=file:sha512t_256:8856f57818f25706d3a8a2d98d024c1185e11a2c6149e0b95811f4b41b7a9b74 pkg.content-hash=gzip:sha512t_256:0d1778a9de63da3e3573fd374b493d5c1abfb024587a81c7f8cf51944aa36414 pkg.csize=31 pkg.size=11
 hardlink path=lib/libc.bronze2.0.hardlink target=/lib/libc.so.1
-license 995ad376b9c7ae79d67e673504fc4199fbfb32eb chash=9374d402ed3034a553119e179d0ae00386bb5206 license=copyright pkg.chash.sha512t_256=e4307a4d5a00e471c9adf331c2c29e00585102e2cc55d454558551aafb02eb63 pkg.content-hash=file:sha512t_256:465c63a3f18339bc1a1bda910720d697e58b9144303dbd2ad9a9ba3e30b87994 pkg.csize=34 pkg.size=14
+license 995ad376b9c7ae79d67e673504fc4199fbfb32eb chash=9374d402ed3034a553119e179d0ae00386bb5206 license=copyright pkg.content-hash=file:sha512t_256:465c63a3f18339bc1a1bda910720d697e58b9144303dbd2ad9a9ba3e30b87994 pkg.content-hash=gzip:sha512t_256:e4307a4d5a00e471c9adf331c2c29e00585102e2cc55d454558551aafb02eb63 pkg.csize=34 pkg.size=14
 link path=usr/bin/jsh target=./sh
 set name=pkg.fmri value={0}
 set name=variant.arch value=i386 value=sparc\
 """.format(self.published[9]), # pkg://os.org/[email protected]
                     "scheme": """\
-file 3b7cee8797632f83a11b66d028016946b4fa47fa chash=00621927edeb8e5b96ef63a93b4c5d125f2a3298 group=bin mode=0444 owner=root path=etc/tree pkg.chash.sha512t_256=079a76079a1c22c13f3c2bb4b6efe8b589c1061b48e893c597c74adb62cac195 pkg.content-hash=file:sha512t_256:6650b24e5c5ceab211c95614def1ae53905a8f415f7fcfdfcc40b778041ed974 pkg.csize=34 pkg.size=14
+file 3b7cee8797632f83a11b66d028016946b4fa47fa chash=00621927edeb8e5b96ef63a93b4c5d125f2a3298 group=bin mode=0444 owner=root path=etc/tree pkg.content-hash=file:sha512t_256:6650b24e5c5ceab211c95614def1ae53905a8f415f7fcfdfcc40b778041ed974 pkg.content-hash=gzip:sha512t_256:079a76079a1c22c13f3c2bb4b6efe8b589c1061b48e893c597c74adb62cac195 pkg.csize=34 pkg.size=14
 set name=pkg.fmri value={0}
 set name=variant.arch value=sparc\
 """.format(self.published[5]), # pkg://os.org/[email protected]
                     "tree": """\
-file 3b7cee8797632f83a11b66d028016946b4fa47fa chash=00621927edeb8e5b96ef63a93b4c5d125f2a3298 group=bin mode=0444 owner=root path=etc/tree pkg.chash.sha512t_256=079a76079a1c22c13f3c2bb4b6efe8b589c1061b48e893c597c74adb62cac195 pkg.content-hash=file:sha512t_256:6650b24e5c5ceab211c95614def1ae53905a8f415f7fcfdfcc40b778041ed974 pkg.csize=34 pkg.size=14
+file 3b7cee8797632f83a11b66d028016946b4fa47fa chash=00621927edeb8e5b96ef63a93b4c5d125f2a3298 group=bin mode=0444 owner=root path=etc/tree pkg.content-hash=file:sha512t_256:6650b24e5c5ceab211c95614def1ae53905a8f415f7fcfdfcc40b778041ed974 pkg.content-hash=gzip:sha512t_256:079a76079a1c22c13f3c2bb4b6efe8b589c1061b48e893c597c74adb62cac195 pkg.csize=34 pkg.size=14
 set name=pkg.fmri value={0}
 set name=variant.arch value=sparc\
 """.format(self.published[4]), # pkg://os.org/[email protected]
@@ -693,27 +693,27 @@
 depend fmri=pkg:/[email protected] type=require variant.arch=arm
 dir group=bin mode=0755 owner=root path=etc
 dir group=bin mode=0755 owner=root path=lib
-file 058b358a95c4417cb6d68eb9e37f41c063e03892 chash=69d518d352b7406393903e41f6316a01c13c53f9 group=bin mode=0444 owner=root path=etc/amber2 pkg.chash.sha512t_256=11771a626d87feca3f2b4436d992636526ca1aa7afc98e4d77a8c32fbb50896f pkg.content-hash=file:sha512t_256:8f4b3ca9e6d12d10c937b85ccdea8d7f26f1019576388612fa86f5d610510e21 pkg.csize=31 pkg.size=11 variant.arch=sparc
-file 05fbc66156a145a81f2985a65988519ffd6bffc6 chash=e22205864f82cf4f25885280135d076bf90f0fd0 group=bin mode=0444 owner=root path=etc/tree pkg.chash.sha512t_256=f0d3ea47ad14f4d1e3df4c33f46d8e7ccba820d2e70ade8542dbf1f17120f2a4 pkg.content-hash=file:sha512t_256:96089d2295ac184fc226c6fd195ba46b8bcd7eaae68ab16de2cb7f505404219a pkg.csize=26 pkg.size=6 variant.arch=arm
-file 05fbc66156a145a81f2985a65988519ffd6bffc6 chash=e22205864f82cf4f25885280135d076bf90f0fd0 group=bin mode=0555 owner=root path=usr/bin/sh pkg.chash.sha512t_256=f0d3ea47ad14f4d1e3df4c33f46d8e7ccba820d2e70ade8542dbf1f17120f2a4 pkg.content-hash=file:sha512t_256:96089d2295ac184fc226c6fd195ba46b8bcd7eaae68ab16de2cb7f505404219a pkg.csize=26 pkg.size=6
-file 5ae4f5f38ad6830ce0f163e5bf925e7a22be8d1d chash=2f4af72b2265bf0c894b18067357d811c3b27c67 group=bin mode=0444 owner=root path=A1/B2/C3/D4/E5/F6/bronzeA2 pkg.chash.sha512t_256=a6e32c459da3aa0d50b89925d1cbc6db9963a8c714e873910ad25ed1c9a73e99 pkg.content-hash=file:sha512t_256:0b00671dcb481fb77388607f5aaa3f90d908f3504d973b041bb220840c6f7450 pkg.csize=32 pkg.size=12
-file 8264e757d4a4d8e2108a26b32edbf0412229b4d6 chash=9f0d43e4d39acd2c97a1ba8e86f3afce4d265757 group=bin mode=0444 owner=root path=etc/scheme pkg.chash.sha512t_256=cff221470e59a3520f3b9b89d8172bc706aa3af3f34aa5e7c706de144f73e78e pkg.content-hash=file:sha512t_256:d0f429df54df78c3ef31adebf47a14804598c1205531822d0571fd78dbd6fe82 pkg.csize=30 pkg.size=10 variant.arch=arm
-file 8264e757d4a4d8e2108a26b32edbf0412229b4d6 chash=9f0d43e4d39acd2c97a1ba8e86f3afce4d265757 group=bin mode=0444 owner=root path=etc/scheme pkg.chash.sha512t_256=cff221470e59a3520f3b9b89d8172bc706aa3af3f34aa5e7c706de144f73e78e pkg.content-hash=file:sha512t_256:d0f429df54df78c3ef31adebf47a14804598c1205531822d0571fd78dbd6fe82 pkg.csize=30 pkg.size=10 variant.arch=i386
-file 8535c15c49cbe1e7cb1a0bf8ff87e512abed66f8 chash=6ff2f52d2f894f5c71fb8fdd3b214e22959fccbb group=bin mode=0555 owner=root path=lib/libc.bronze pkg.chash.sha512t_256=a43a748d42d29549dce338f2e8104e95718cc19438d9a17aee78239c9349a89a pkg.content-hash=file:sha512t_256:30d1f2a7e683a2a7049217876a72dca7f782a2cac043548abe536bcd06d9ea6b pkg.csize=33 pkg.size=13
-file a268afd7e6131a2273314b397dd6232827b6152b chash=2e7390833be180b7373d90884ec1e45bd1edfa92 group=bin mode=0444 owner=root path=etc/bronze1 pkg.chash.sha512t_256=0d1778a9de63da3e3573fd374b493d5c1abfb024587a81c7f8cf51944aa36414 pkg.content-hash=file:sha512t_256:8856f57818f25706d3a8a2d98d024c1185e11a2c6149e0b95811f4b41b7a9b74 pkg.csize=31 pkg.size=11
+file 058b358a95c4417cb6d68eb9e37f41c063e03892 chash=69d518d352b7406393903e41f6316a01c13c53f9 group=bin mode=0444 owner=root path=etc/amber2 pkg.content-hash=file:sha512t_256:8f4b3ca9e6d12d10c937b85ccdea8d7f26f1019576388612fa86f5d610510e21 pkg.content-hash=gzip:sha512t_256:11771a626d87feca3f2b4436d992636526ca1aa7afc98e4d77a8c32fbb50896f pkg.csize=31 pkg.size=11 variant.arch=sparc
+file 05fbc66156a145a81f2985a65988519ffd6bffc6 chash=e22205864f82cf4f25885280135d076bf90f0fd0 group=bin mode=0444 owner=root path=etc/tree pkg.content-hash=file:sha512t_256:96089d2295ac184fc226c6fd195ba46b8bcd7eaae68ab16de2cb7f505404219a pkg.content-hash=gzip:sha512t_256:f0d3ea47ad14f4d1e3df4c33f46d8e7ccba820d2e70ade8542dbf1f17120f2a4 pkg.csize=26 pkg.size=6 variant.arch=arm
+file 05fbc66156a145a81f2985a65988519ffd6bffc6 chash=e22205864f82cf4f25885280135d076bf90f0fd0 group=bin mode=0555 owner=root path=usr/bin/sh pkg.content-hash=file:sha512t_256:96089d2295ac184fc226c6fd195ba46b8bcd7eaae68ab16de2cb7f505404219a pkg.content-hash=gzip:sha512t_256:f0d3ea47ad14f4d1e3df4c33f46d8e7ccba820d2e70ade8542dbf1f17120f2a4 pkg.csize=26 pkg.size=6
+file 5ae4f5f38ad6830ce0f163e5bf925e7a22be8d1d chash=2f4af72b2265bf0c894b18067357d811c3b27c67 group=bin mode=0444 owner=root path=A1/B2/C3/D4/E5/F6/bronzeA2 pkg.content-hash=file:sha512t_256:0b00671dcb481fb77388607f5aaa3f90d908f3504d973b041bb220840c6f7450 pkg.content-hash=gzip:sha512t_256:a6e32c459da3aa0d50b89925d1cbc6db9963a8c714e873910ad25ed1c9a73e99 pkg.csize=32 pkg.size=12
+file 8264e757d4a4d8e2108a26b32edbf0412229b4d6 chash=9f0d43e4d39acd2c97a1ba8e86f3afce4d265757 group=bin mode=0444 owner=root path=etc/scheme pkg.content-hash=file:sha512t_256:d0f429df54df78c3ef31adebf47a14804598c1205531822d0571fd78dbd6fe82 pkg.content-hash=gzip:sha512t_256:cff221470e59a3520f3b9b89d8172bc706aa3af3f34aa5e7c706de144f73e78e pkg.csize=30 pkg.size=10 variant.arch=arm
+file 8264e757d4a4d8e2108a26b32edbf0412229b4d6 chash=9f0d43e4d39acd2c97a1ba8e86f3afce4d265757 group=bin mode=0444 owner=root path=etc/scheme pkg.content-hash=file:sha512t_256:d0f429df54df78c3ef31adebf47a14804598c1205531822d0571fd78dbd6fe82 pkg.content-hash=gzip:sha512t_256:cff221470e59a3520f3b9b89d8172bc706aa3af3f34aa5e7c706de144f73e78e pkg.csize=30 pkg.size=10 variant.arch=i386
+file 8535c15c49cbe1e7cb1a0bf8ff87e512abed66f8 chash=6ff2f52d2f894f5c71fb8fdd3b214e22959fccbb group=bin mode=0555 owner=root path=lib/libc.bronze pkg.content-hash=file:sha512t_256:30d1f2a7e683a2a7049217876a72dca7f782a2cac043548abe536bcd06d9ea6b pkg.content-hash=gzip:sha512t_256:a43a748d42d29549dce338f2e8104e95718cc19438d9a17aee78239c9349a89a pkg.csize=33 pkg.size=13
+file a268afd7e6131a2273314b397dd6232827b6152b chash=2e7390833be180b7373d90884ec1e45bd1edfa92 group=bin mode=0444 owner=root path=etc/bronze1 pkg.content-hash=file:sha512t_256:8856f57818f25706d3a8a2d98d024c1185e11a2c6149e0b95811f4b41b7a9b74 pkg.content-hash=gzip:sha512t_256:0d1778a9de63da3e3573fd374b493d5c1abfb024587a81c7f8cf51944aa36414 pkg.csize=31 pkg.size=11
 hardlink path=lib/libc.bronze2.0.hardlink target=/lib/libc.so.1
-license 995ad376b9c7ae79d67e673504fc4199fbfb32eb chash=9374d402ed3034a553119e179d0ae00386bb5206 license=copyright pkg.chash.sha512t_256=e4307a4d5a00e471c9adf331c2c29e00585102e2cc55d454558551aafb02eb63 pkg.content-hash=file:sha512t_256:465c63a3f18339bc1a1bda910720d697e58b9144303dbd2ad9a9ba3e30b87994 pkg.csize=34 pkg.size=14
+license 995ad376b9c7ae79d67e673504fc4199fbfb32eb chash=9374d402ed3034a553119e179d0ae00386bb5206 license=copyright pkg.content-hash=file:sha512t_256:465c63a3f18339bc1a1bda910720d697e58b9144303dbd2ad9a9ba3e30b87994 pkg.content-hash=gzip:sha512t_256:e4307a4d5a00e471c9adf331c2c29e00585102e2cc55d454558551aafb02eb63 pkg.csize=34 pkg.size=14
 link path=usr/bin/jsh target=./sh
 set name=pkg.fmri value={0}
 set name=variant.arch value=sparc value=i386 value=arm\
 """.format(self.published[13]), # pkg://os.org/[email protected]
                     "scheme": """\
-file 3b7cee8797632f83a11b66d028016946b4fa47fa chash=00621927edeb8e5b96ef63a93b4c5d125f2a3298 group=bin mode=0444 owner=root path=etc/tree pkg.chash.sha512t_256=079a76079a1c22c13f3c2bb4b6efe8b589c1061b48e893c597c74adb62cac195 pkg.content-hash=file:sha512t_256:6650b24e5c5ceab211c95614def1ae53905a8f415f7fcfdfcc40b778041ed974 pkg.csize=34 pkg.size=14
+file 3b7cee8797632f83a11b66d028016946b4fa47fa chash=00621927edeb8e5b96ef63a93b4c5d125f2a3298 group=bin mode=0444 owner=root path=etc/tree pkg.content-hash=file:sha512t_256:6650b24e5c5ceab211c95614def1ae53905a8f415f7fcfdfcc40b778041ed974 pkg.content-hash=gzip:sha512t_256:079a76079a1c22c13f3c2bb4b6efe8b589c1061b48e893c597c74adb62cac195 pkg.csize=34 pkg.size=14
 set name=pkg.fmri value={0}
 set name=variant.arch value=sparc\
 """.format(self.published[5]), # pkg://os.org/[email protected]
                     "tree": """\
-file 3b7cee8797632f83a11b66d028016946b4fa47fa chash=00621927edeb8e5b96ef63a93b4c5d125f2a3298 group=bin mode=0444 owner=root path=etc/tree pkg.chash.sha512t_256=079a76079a1c22c13f3c2bb4b6efe8b589c1061b48e893c597c74adb62cac195 pkg.content-hash=file:sha512t_256:6650b24e5c5ceab211c95614def1ae53905a8f415f7fcfdfcc40b778041ed974 pkg.csize=34 pkg.size=14
+file 3b7cee8797632f83a11b66d028016946b4fa47fa chash=00621927edeb8e5b96ef63a93b4c5d125f2a3298 group=bin mode=0444 owner=root path=etc/tree pkg.content-hash=file:sha512t_256:6650b24e5c5ceab211c95614def1ae53905a8f415f7fcfdfcc40b778041ed974 pkg.content-hash=gzip:sha512t_256:079a76079a1c22c13f3c2bb4b6efe8b589c1061b48e893c597c74adb62cac195 pkg.csize=34 pkg.size=14
 set name=pkg.fmri value={0}
 set name=variant.arch value=sparc value=arm\
 """.format(self.published[14]), # pkg://os.org/[email protected]
@@ -840,39 +840,39 @@
 depend fmri=pkg:/[email protected] type=require variant.arch=arm
 dir group=bin mode=0755 owner=root path=etc
 dir group=bin mode=0755 owner=root path=lib
-file 058b358a95c4417cb6d68eb9e37f41c063e03892 chash=69d518d352b7406393903e41f6316a01c13c53f9 group=bin mode=0444 owner=root path=etc/amber2 pkg.chash.sha512t_256=11771a626d87feca3f2b4436d992636526ca1aa7afc98e4d77a8c32fbb50896f pkg.content-hash=file:sha512t_256:8f4b3ca9e6d12d10c937b85ccdea8d7f26f1019576388612fa86f5d610510e21 pkg.csize=31 pkg.size=11 variant.arch=sparc variant.debug=false
-file 05fbc66156a145a81f2985a65988519ffd6bffc6 chash=e22205864f82cf4f25885280135d076bf90f0fd0 group=bin mode=0444 owner=root path=etc/tree pkg.chash.sha512t_256=f0d3ea47ad14f4d1e3df4c33f46d8e7ccba820d2e70ade8542dbf1f17120f2a4 pkg.content-hash=file:sha512t_256:96089d2295ac184fc226c6fd195ba46b8bcd7eaae68ab16de2cb7f505404219a pkg.csize=26 pkg.size=6 variant.arch=arm variant.debug=false
-file 05fbc66156a145a81f2985a65988519ffd6bffc6 chash=e22205864f82cf4f25885280135d076bf90f0fd0 group=bin mode=0555 owner=root path=usr/bin/sh pkg.chash.sha512t_256=f0d3ea47ad14f4d1e3df4c33f46d8e7ccba820d2e70ade8542dbf1f17120f2a4 pkg.content-hash=file:sha512t_256:96089d2295ac184fc226c6fd195ba46b8bcd7eaae68ab16de2cb7f505404219a pkg.csize=26 pkg.size=6 variant.debug=false
-file 1abe1a7084720f501912eceb1312ddd799fb2a34 chash=ea7230676e13986491d7405c5a9298e074930575 group=bin mode=0444 owner=root path=etc/bronze1 pkg.chash.sha512t_256=012f554bf1011be581f891682a7c406156bfef7be6ad6f785db586caf3a50f48 pkg.content-hash=file:sha512t_256:f0316c9af93368a37c837317681af5d6ac5d8fa4feab284cd952906a1689d203 pkg.csize=37 pkg.size=17 variant.debug=true
-file 34f88965d55d3a730fa7683bc0f370fc6e42bf95 chash=66eebb69ee0299dcb495162336db81a3188de037 group=bin mode=0444 owner=root path=etc/tree pkg.chash.sha512t_256=5446e3eab72747cfe5e2b01fb0936a626693088d5e214dbe7af20823d76a61fb pkg.content-hash=file:sha512t_256:23589d1dbb98cc597ed74ed10e38afed113e73c30ed6dcfd98971541477f1167 pkg.csize=32 pkg.size=12 variant.arch=arm variant.debug=true
-file 34f88965d55d3a730fa7683bc0f370fc6e42bf95 chash=66eebb69ee0299dcb495162336db81a3188de037 group=bin mode=0555 owner=root path=usr/bin/sh pkg.chash.sha512t_256=5446e3eab72747cfe5e2b01fb0936a626693088d5e214dbe7af20823d76a61fb pkg.content-hash=file:sha512t_256:23589d1dbb98cc597ed74ed10e38afed113e73c30ed6dcfd98971541477f1167 pkg.csize=32 pkg.size=12 variant.debug=true
-file 5ae4f5f38ad6830ce0f163e5bf925e7a22be8d1d chash=2f4af72b2265bf0c894b18067357d811c3b27c67 group=bin mode=0444 owner=root path=A1/B2/C3/D4/E5/F6/bronzeA2 pkg.chash.sha512t_256=a6e32c459da3aa0d50b89925d1cbc6db9963a8c714e873910ad25ed1c9a73e99 pkg.content-hash=file:sha512t_256:0b00671dcb481fb77388607f5aaa3f90d908f3504d973b041bb220840c6f7450 pkg.csize=32 pkg.size=12 variant.debug=false
-file 6d8f3b9498aa3bbe7db01189b88f1b71f4ce40ad chash=6f3882864ebd7fd1a09e0e7b889fdc524c8c8bb2 group=bin mode=0444 owner=root path=etc/amber2 pkg.chash.sha512t_256=06ef53c008e21b0dae05e56358914ab0620fc97c49d9aab40bf480b105c9f936 pkg.content-hash=file:sha512t_256:affa8263da55235926301acddd6d45c97bfc530ac09873eccae8a2a052f45d95 pkg.csize=37 pkg.size=17 variant.arch=sparc variant.debug=true
-file 8264e757d4a4d8e2108a26b32edbf0412229b4d6 chash=9f0d43e4d39acd2c97a1ba8e86f3afce4d265757 group=bin mode=0444 owner=root path=etc/scheme pkg.chash.sha512t_256=cff221470e59a3520f3b9b89d8172bc706aa3af3f34aa5e7c706de144f73e78e pkg.content-hash=file:sha512t_256:d0f429df54df78c3ef31adebf47a14804598c1205531822d0571fd78dbd6fe82 pkg.csize=30 pkg.size=10 variant.arch=arm variant.debug=false
-file 8264e757d4a4d8e2108a26b32edbf0412229b4d6 chash=9f0d43e4d39acd2c97a1ba8e86f3afce4d265757 group=bin mode=0444 owner=root path=etc/scheme pkg.chash.sha512t_256=cff221470e59a3520f3b9b89d8172bc706aa3af3f34aa5e7c706de144f73e78e pkg.content-hash=file:sha512t_256:d0f429df54df78c3ef31adebf47a14804598c1205531822d0571fd78dbd6fe82 pkg.csize=30 pkg.size=10 variant.arch=i386 variant.debug=false
-file 8535c15c49cbe1e7cb1a0bf8ff87e512abed66f8 chash=6ff2f52d2f894f5c71fb8fdd3b214e22959fccbb group=bin mode=0555 owner=root path=lib/libc.bronze pkg.chash.sha512t_256=a43a748d42d29549dce338f2e8104e95718cc19438d9a17aee78239c9349a89a pkg.content-hash=file:sha512t_256:30d1f2a7e683a2a7049217876a72dca7f782a2cac043548abe536bcd06d9ea6b pkg.csize=33 pkg.size=13
-file 91fa26695f9891b2d94fd72c31b640efb5589da5 chash=4eed1e5dc5ab131812da34dc148562e6833fa92b group=bin mode=0444 owner=root path=etc/scheme pkg.chash.sha512t_256=1aaeeaeba9240732004d056619d099b4f1260147a7348f59364f05455434844e pkg.content-hash=file:sha512t_256:583b7d7ddbfbd65e04465041d487ad7e640cafa2244ead7327c7380731272b0e pkg.csize=36 pkg.size=16 variant.arch=arm variant.debug=true
-file 91fa26695f9891b2d94fd72c31b640efb5589da5 chash=4eed1e5dc5ab131812da34dc148562e6833fa92b group=bin mode=0444 owner=root path=etc/scheme pkg.chash.sha512t_256=1aaeeaeba9240732004d056619d099b4f1260147a7348f59364f05455434844e pkg.content-hash=file:sha512t_256:583b7d7ddbfbd65e04465041d487ad7e640cafa2244ead7327c7380731272b0e pkg.csize=36 pkg.size=16 variant.arch=i386 variant.debug=true
-file a268afd7e6131a2273314b397dd6232827b6152b chash=2e7390833be180b7373d90884ec1e45bd1edfa92 group=bin mode=0444 owner=root path=etc/bronze1 pkg.chash.sha512t_256=0d1778a9de63da3e3573fd374b493d5c1abfb024587a81c7f8cf51944aa36414 pkg.content-hash=file:sha512t_256:8856f57818f25706d3a8a2d98d024c1185e11a2c6149e0b95811f4b41b7a9b74 pkg.csize=31 pkg.size=11 variant.debug=false
-file cf68b26a90cb9a0d7510f24cfb8cf6d901cec34e chash=0eb6fe69c4492f801c35dcc9175d55f783cc64a2 group=bin mode=0444 owner=root path=A1/B2/C3/D4/E5/F6/bronzeA2 pkg.chash.sha512t_256=668a84f1a74a11695d1b233712ecc6f03aff0934e8523635d4806ca11bb06f3a pkg.content-hash=file:sha512t_256:648bdc5300e3b597ac223b8220257219a5efdeee7d7401c9cbd823d958e5e585 pkg.csize=38 pkg.size=18 variant.debug=true
+file 058b358a95c4417cb6d68eb9e37f41c063e03892 chash=69d518d352b7406393903e41f6316a01c13c53f9 group=bin mode=0444 owner=root path=etc/amber2 pkg.content-hash=file:sha512t_256:8f4b3ca9e6d12d10c937b85ccdea8d7f26f1019576388612fa86f5d610510e21 pkg.content-hash=gzip:sha512t_256:11771a626d87feca3f2b4436d992636526ca1aa7afc98e4d77a8c32fbb50896f pkg.csize=31 pkg.size=11 variant.arch=sparc variant.debug=false
+file 05fbc66156a145a81f2985a65988519ffd6bffc6 chash=e22205864f82cf4f25885280135d076bf90f0fd0 group=bin mode=0444 owner=root path=etc/tree pkg.content-hash=file:sha512t_256:96089d2295ac184fc226c6fd195ba46b8bcd7eaae68ab16de2cb7f505404219a pkg.content-hash=gzip:sha512t_256:f0d3ea47ad14f4d1e3df4c33f46d8e7ccba820d2e70ade8542dbf1f17120f2a4 pkg.csize=26 pkg.size=6 variant.arch=arm variant.debug=false
+file 05fbc66156a145a81f2985a65988519ffd6bffc6 chash=e22205864f82cf4f25885280135d076bf90f0fd0 group=bin mode=0555 owner=root path=usr/bin/sh pkg.content-hash=file:sha512t_256:96089d2295ac184fc226c6fd195ba46b8bcd7eaae68ab16de2cb7f505404219a pkg.content-hash=gzip:sha512t_256:f0d3ea47ad14f4d1e3df4c33f46d8e7ccba820d2e70ade8542dbf1f17120f2a4 pkg.csize=26 pkg.size=6 variant.debug=false
+file 1abe1a7084720f501912eceb1312ddd799fb2a34 chash=ea7230676e13986491d7405c5a9298e074930575 group=bin mode=0444 owner=root path=etc/bronze1 pkg.content-hash=file:sha512t_256:f0316c9af93368a37c837317681af5d6ac5d8fa4feab284cd952906a1689d203 pkg.content-hash=gzip:sha512t_256:012f554bf1011be581f891682a7c406156bfef7be6ad6f785db586caf3a50f48 pkg.csize=37 pkg.size=17 variant.debug=true
+file 34f88965d55d3a730fa7683bc0f370fc6e42bf95 chash=66eebb69ee0299dcb495162336db81a3188de037 group=bin mode=0444 owner=root path=etc/tree pkg.content-hash=file:sha512t_256:23589d1dbb98cc597ed74ed10e38afed113e73c30ed6dcfd98971541477f1167 pkg.content-hash=gzip:sha512t_256:5446e3eab72747cfe5e2b01fb0936a626693088d5e214dbe7af20823d76a61fb pkg.csize=32 pkg.size=12 variant.arch=arm variant.debug=true
+file 34f88965d55d3a730fa7683bc0f370fc6e42bf95 chash=66eebb69ee0299dcb495162336db81a3188de037 group=bin mode=0555 owner=root path=usr/bin/sh pkg.content-hash=file:sha512t_256:23589d1dbb98cc597ed74ed10e38afed113e73c30ed6dcfd98971541477f1167 pkg.content-hash=gzip:sha512t_256:5446e3eab72747cfe5e2b01fb0936a626693088d5e214dbe7af20823d76a61fb pkg.csize=32 pkg.size=12 variant.debug=true
+file 5ae4f5f38ad6830ce0f163e5bf925e7a22be8d1d chash=2f4af72b2265bf0c894b18067357d811c3b27c67 group=bin mode=0444 owner=root path=A1/B2/C3/D4/E5/F6/bronzeA2 pkg.content-hash=file:sha512t_256:0b00671dcb481fb77388607f5aaa3f90d908f3504d973b041bb220840c6f7450 pkg.content-hash=gzip:sha512t_256:a6e32c459da3aa0d50b89925d1cbc6db9963a8c714e873910ad25ed1c9a73e99 pkg.csize=32 pkg.size=12 variant.debug=false
+file 6d8f3b9498aa3bbe7db01189b88f1b71f4ce40ad chash=6f3882864ebd7fd1a09e0e7b889fdc524c8c8bb2 group=bin mode=0444 owner=root path=etc/amber2 pkg.content-hash=file:sha512t_256:affa8263da55235926301acddd6d45c97bfc530ac09873eccae8a2a052f45d95 pkg.content-hash=gzip:sha512t_256:06ef53c008e21b0dae05e56358914ab0620fc97c49d9aab40bf480b105c9f936 pkg.csize=37 pkg.size=17 variant.arch=sparc variant.debug=true
+file 8264e757d4a4d8e2108a26b32edbf0412229b4d6 chash=9f0d43e4d39acd2c97a1ba8e86f3afce4d265757 group=bin mode=0444 owner=root path=etc/scheme pkg.content-hash=file:sha512t_256:d0f429df54df78c3ef31adebf47a14804598c1205531822d0571fd78dbd6fe82 pkg.content-hash=gzip:sha512t_256:cff221470e59a3520f3b9b89d8172bc706aa3af3f34aa5e7c706de144f73e78e pkg.csize=30 pkg.size=10 variant.arch=arm variant.debug=false
+file 8264e757d4a4d8e2108a26b32edbf0412229b4d6 chash=9f0d43e4d39acd2c97a1ba8e86f3afce4d265757 group=bin mode=0444 owner=root path=etc/scheme pkg.content-hash=file:sha512t_256:d0f429df54df78c3ef31adebf47a14804598c1205531822d0571fd78dbd6fe82 pkg.content-hash=gzip:sha512t_256:cff221470e59a3520f3b9b89d8172bc706aa3af3f34aa5e7c706de144f73e78e pkg.csize=30 pkg.size=10 variant.arch=i386 variant.debug=false
+file 8535c15c49cbe1e7cb1a0bf8ff87e512abed66f8 chash=6ff2f52d2f894f5c71fb8fdd3b214e22959fccbb group=bin mode=0555 owner=root path=lib/libc.bronze pkg.content-hash=file:sha512t_256:30d1f2a7e683a2a7049217876a72dca7f782a2cac043548abe536bcd06d9ea6b pkg.content-hash=gzip:sha512t_256:a43a748d42d29549dce338f2e8104e95718cc19438d9a17aee78239c9349a89a pkg.csize=33 pkg.size=13
+file 91fa26695f9891b2d94fd72c31b640efb5589da5 chash=4eed1e5dc5ab131812da34dc148562e6833fa92b group=bin mode=0444 owner=root path=etc/scheme pkg.content-hash=file:sha512t_256:583b7d7ddbfbd65e04465041d487ad7e640cafa2244ead7327c7380731272b0e pkg.content-hash=gzip:sha512t_256:1aaeeaeba9240732004d056619d099b4f1260147a7348f59364f05455434844e pkg.csize=36 pkg.size=16 variant.arch=arm variant.debug=true
+file 91fa26695f9891b2d94fd72c31b640efb5589da5 chash=4eed1e5dc5ab131812da34dc148562e6833fa92b group=bin mode=0444 owner=root path=etc/scheme pkg.content-hash=file:sha512t_256:583b7d7ddbfbd65e04465041d487ad7e640cafa2244ead7327c7380731272b0e pkg.content-hash=gzip:sha512t_256:1aaeeaeba9240732004d056619d099b4f1260147a7348f59364f05455434844e pkg.csize=36 pkg.size=16 variant.arch=i386 variant.debug=true
+file a268afd7e6131a2273314b397dd6232827b6152b chash=2e7390833be180b7373d90884ec1e45bd1edfa92 group=bin mode=0444 owner=root path=etc/bronze1 pkg.content-hash=file:sha512t_256:8856f57818f25706d3a8a2d98d024c1185e11a2c6149e0b95811f4b41b7a9b74 pkg.content-hash=gzip:sha512t_256:0d1778a9de63da3e3573fd374b493d5c1abfb024587a81c7f8cf51944aa36414 pkg.csize=31 pkg.size=11 variant.debug=false
+file cf68b26a90cb9a0d7510f24cfb8cf6d901cec34e chash=0eb6fe69c4492f801c35dcc9175d55f783cc64a2 group=bin mode=0444 owner=root path=A1/B2/C3/D4/E5/F6/bronzeA2 pkg.content-hash=file:sha512t_256:648bdc5300e3b597ac223b8220257219a5efdeee7d7401c9cbd823d958e5e585 pkg.content-hash=gzip:sha512t_256:668a84f1a74a11695d1b233712ecc6f03aff0934e8523635d4806ca11bb06f3a pkg.csize=38 pkg.size=18 variant.debug=true
 hardlink path=lib/libc.bronze2.0.hardlink target=/lib/libc.so.1
-license 773b94a252723da43e8f969b4384701bcd41ce12 chash=e0715301fc211f6543ce0c444f4c34e38c70f70e license=copyright pkg.chash.sha512t_256=e9ab6146497d7525d8aaee4b506482499dcbe0c35e6b8aca38fbd3589f7ed89a pkg.content-hash=file:sha512t_256:9bfa648ff40aba0dc609156b600fadf21ba79c8983acd60f425bdae4c4b44b2f pkg.csize=40 pkg.size=20 variant.debug=true
-license 995ad376b9c7ae79d67e673504fc4199fbfb32eb chash=9374d402ed3034a553119e179d0ae00386bb5206 license=copyright pkg.chash.sha512t_256=e4307a4d5a00e471c9adf331c2c29e00585102e2cc55d454558551aafb02eb63 pkg.content-hash=file:sha512t_256:465c63a3f18339bc1a1bda910720d697e58b9144303dbd2ad9a9ba3e30b87994 pkg.csize=34 pkg.size=14 variant.debug=false
+license 773b94a252723da43e8f969b4384701bcd41ce12 chash=e0715301fc211f6543ce0c444f4c34e38c70f70e license=copyright pkg.content-hash=file:sha512t_256:9bfa648ff40aba0dc609156b600fadf21ba79c8983acd60f425bdae4c4b44b2f pkg.content-hash=gzip:sha512t_256:e9ab6146497d7525d8aaee4b506482499dcbe0c35e6b8aca38fbd3589f7ed89a pkg.csize=40 pkg.size=20 variant.debug=true
+license 995ad376b9c7ae79d67e673504fc4199fbfb32eb chash=9374d402ed3034a553119e179d0ae00386bb5206 license=copyright pkg.content-hash=file:sha512t_256:465c63a3f18339bc1a1bda910720d697e58b9144303dbd2ad9a9ba3e30b87994 pkg.content-hash=gzip:sha512t_256:e4307a4d5a00e471c9adf331c2c29e00585102e2cc55d454558551aafb02eb63 pkg.csize=34 pkg.size=14 variant.debug=false
 link path=usr/bin/jsh target=./sh
 set name=pkg.fmri value={0}
 set name=variant.arch value=sparc value=i386 value=arm
 set name=variant.debug value=false value=true\
 """.format(self.published_debug[13]), # pkg://os.org/[email protected]
                     "scheme": """\
-file 3a06aa547ffe0186a2b9db55b8853874a048fb47 chash=ab50364de4ce8f847d765d402d80e37431e1f0aa group=bin mode=0444 owner=root path=etc/tree pkg.chash.sha512t_256=bfdce1dc4ab94f2321f2bae46505dd204b2df323df55efadf4f3b4c3326b204d pkg.content-hash=file:sha512t_256:e1152d631b4c2fda4a2b739d38e4cbc3e8d7ccf2aa5be2aef6ab776a60d5a187 pkg.csize=40 pkg.size=20 variant.debug=true
-file 3b7cee8797632f83a11b66d028016946b4fa47fa chash=00621927edeb8e5b96ef63a93b4c5d125f2a3298 group=bin mode=0444 owner=root path=etc/tree pkg.chash.sha512t_256=079a76079a1c22c13f3c2bb4b6efe8b589c1061b48e893c597c74adb62cac195 pkg.content-hash=file:sha512t_256:6650b24e5c5ceab211c95614def1ae53905a8f415f7fcfdfcc40b778041ed974 pkg.csize=34 pkg.size=14 variant.debug=false
+file 3a06aa547ffe0186a2b9db55b8853874a048fb47 chash=ab50364de4ce8f847d765d402d80e37431e1f0aa group=bin mode=0444 owner=root path=etc/tree pkg.content-hash=file:sha512t_256:e1152d631b4c2fda4a2b739d38e4cbc3e8d7ccf2aa5be2aef6ab776a60d5a187 pkg.content-hash=gzip:sha512t_256:bfdce1dc4ab94f2321f2bae46505dd204b2df323df55efadf4f3b4c3326b204d pkg.csize=40 pkg.size=20 variant.debug=true
+file 3b7cee8797632f83a11b66d028016946b4fa47fa chash=00621927edeb8e5b96ef63a93b4c5d125f2a3298 group=bin mode=0444 owner=root path=etc/tree pkg.content-hash=file:sha512t_256:6650b24e5c5ceab211c95614def1ae53905a8f415f7fcfdfcc40b778041ed974 pkg.content-hash=gzip:sha512t_256:079a76079a1c22c13f3c2bb4b6efe8b589c1061b48e893c597c74adb62cac195 pkg.csize=34 pkg.size=14 variant.debug=false
 set name=pkg.fmri value={0}
 set name=variant.arch value=sparc
 set name=variant.debug value=false value=true\
 """.format(self.published_debug[5]), # pkg://os.org/[email protected]
                     "tree": """\
-file 3a06aa547ffe0186a2b9db55b8853874a048fb47 chash=ab50364de4ce8f847d765d402d80e37431e1f0aa group=bin mode=0444 owner=root path=etc/tree pkg.chash.sha512t_256=bfdce1dc4ab94f2321f2bae46505dd204b2df323df55efadf4f3b4c3326b204d pkg.content-hash=file:sha512t_256:e1152d631b4c2fda4a2b739d38e4cbc3e8d7ccf2aa5be2aef6ab776a60d5a187 pkg.csize=40 pkg.size=20 variant.debug=true
-file 3b7cee8797632f83a11b66d028016946b4fa47fa chash=00621927edeb8e5b96ef63a93b4c5d125f2a3298 group=bin mode=0444 owner=root path=etc/tree pkg.chash.sha512t_256=079a76079a1c22c13f3c2bb4b6efe8b589c1061b48e893c597c74adb62cac195 pkg.content-hash=file:sha512t_256:6650b24e5c5ceab211c95614def1ae53905a8f415f7fcfdfcc40b778041ed974 pkg.csize=34 pkg.size=14 variant.debug=false
+file 3a06aa547ffe0186a2b9db55b8853874a048fb47 chash=ab50364de4ce8f847d765d402d80e37431e1f0aa group=bin mode=0444 owner=root path=etc/tree pkg.content-hash=file:sha512t_256:e1152d631b4c2fda4a2b739d38e4cbc3e8d7ccf2aa5be2aef6ab776a60d5a187 pkg.content-hash=gzip:sha512t_256:bfdce1dc4ab94f2321f2bae46505dd204b2df323df55efadf4f3b4c3326b204d pkg.csize=40 pkg.size=20 variant.debug=true
+file 3b7cee8797632f83a11b66d028016946b4fa47fa chash=00621927edeb8e5b96ef63a93b4c5d125f2a3298 group=bin mode=0444 owner=root path=etc/tree pkg.content-hash=file:sha512t_256:6650b24e5c5ceab211c95614def1ae53905a8f415f7fcfdfcc40b778041ed974 pkg.content-hash=gzip:sha512t_256:079a76079a1c22c13f3c2bb4b6efe8b589c1061b48e893c597c74adb62cac195 pkg.csize=34 pkg.size=14 variant.debug=false
 set name=pkg.fmri value={0}
 set name=variant.arch value=sparc value=arm
 set name=variant.debug value=false value=true\
@@ -955,29 +955,29 @@
 depend fmri=pkg:/[email protected] type=require variant.arch=arm
 dir group=bin mode=0755 owner=root path=etc
 dir group=bin mode=0755 owner=root path=lib
-file 058b358a95c4417cb6d68eb9e37f41c063e03892 chash=69d518d352b7406393903e41f6316a01c13c53f9 group=bin mode=0444 owner=root path=etc/amber2 pkg.chash.sha512t_256=11771a626d87feca3f2b4436d992636526ca1aa7afc98e4d77a8c32fbb50896f pkg.content-hash=file:sha512t_256:8f4b3ca9e6d12d10c937b85ccdea8d7f26f1019576388612fa86f5d610510e21 pkg.csize=31 pkg.size=11 variant.arch=sparc variant.debug=false
-file 05fbc66156a145a81f2985a65988519ffd6bffc6 chash=e22205864f82cf4f25885280135d076bf90f0fd0 group=bin mode=0444 owner=root path=etc/tree pkg.chash.sha512t_256=f0d3ea47ad14f4d1e3df4c33f46d8e7ccba820d2e70ade8542dbf1f17120f2a4 pkg.content-hash=file:sha512t_256:96089d2295ac184fc226c6fd195ba46b8bcd7eaae68ab16de2cb7f505404219a pkg.csize=26 pkg.size=6 variant.arch=arm
-file 05fbc66156a145a81f2985a65988519ffd6bffc6 chash=e22205864f82cf4f25885280135d076bf90f0fd0 group=bin mode=0555 owner=root path=usr/bin/sh pkg.chash.sha512t_256=f0d3ea47ad14f4d1e3df4c33f46d8e7ccba820d2e70ade8542dbf1f17120f2a4 pkg.content-hash=file:sha512t_256:96089d2295ac184fc226c6fd195ba46b8bcd7eaae68ab16de2cb7f505404219a pkg.csize=26 pkg.size=6 variant.arch=arm
-file 05fbc66156a145a81f2985a65988519ffd6bffc6 chash=e22205864f82cf4f25885280135d076bf90f0fd0 group=bin mode=0555 owner=root path=usr/bin/sh pkg.chash.sha512t_256=f0d3ea47ad14f4d1e3df4c33f46d8e7ccba820d2e70ade8542dbf1f17120f2a4 pkg.content-hash=file:sha512t_256:96089d2295ac184fc226c6fd195ba46b8bcd7eaae68ab16de2cb7f505404219a pkg.csize=26 pkg.size=6 variant.arch=i386
-file 05fbc66156a145a81f2985a65988519ffd6bffc6 chash=e22205864f82cf4f25885280135d076bf90f0fd0 group=bin mode=0555 owner=root path=usr/bin/sh pkg.chash.sha512t_256=f0d3ea47ad14f4d1e3df4c33f46d8e7ccba820d2e70ade8542dbf1f17120f2a4 pkg.content-hash=file:sha512t_256:96089d2295ac184fc226c6fd195ba46b8bcd7eaae68ab16de2cb7f505404219a pkg.csize=26 pkg.size=6 variant.arch=sparc variant.debug=false
-file 1abe1a7084720f501912eceb1312ddd799fb2a34 chash=ea7230676e13986491d7405c5a9298e074930575 group=bin mode=0444 owner=root path=etc/bronze1 pkg.chash.sha512t_256=012f554bf1011be581f891682a7c406156bfef7be6ad6f785db586caf3a50f48 pkg.content-hash=file:sha512t_256:f0316c9af93368a37c837317681af5d6ac5d8fa4feab284cd952906a1689d203 pkg.csize=37 pkg.size=17 variant.arch=sparc variant.debug=true
-file 34f88965d55d3a730fa7683bc0f370fc6e42bf95 chash=66eebb69ee0299dcb495162336db81a3188de037 group=bin mode=0555 owner=root path=usr/bin/sh pkg.chash.sha512t_256=5446e3eab72747cfe5e2b01fb0936a626693088d5e214dbe7af20823d76a61fb pkg.content-hash=file:sha512t_256:23589d1dbb98cc597ed74ed10e38afed113e73c30ed6dcfd98971541477f1167 pkg.csize=32 pkg.size=12 variant.arch=sparc variant.debug=true
-file 5ae4f5f38ad6830ce0f163e5bf925e7a22be8d1d chash=2f4af72b2265bf0c894b18067357d811c3b27c67 group=bin mode=0444 owner=root path=A1/B2/C3/D4/E5/F6/bronzeA2 pkg.chash.sha512t_256=a6e32c459da3aa0d50b89925d1cbc6db9963a8c714e873910ad25ed1c9a73e99 pkg.content-hash=file:sha512t_256:0b00671dcb481fb77388607f5aaa3f90d908f3504d973b041bb220840c6f7450 pkg.csize=32 pkg.size=12 variant.arch=arm
-file 5ae4f5f38ad6830ce0f163e5bf925e7a22be8d1d chash=2f4af72b2265bf0c894b18067357d811c3b27c67 group=bin mode=0444 owner=root path=A1/B2/C3/D4/E5/F6/bronzeA2 pkg.chash.sha512t_256=a6e32c459da3aa0d50b89925d1cbc6db9963a8c714e873910ad25ed1c9a73e99 pkg.content-hash=file:sha512t_256:0b00671dcb481fb77388607f5aaa3f90d908f3504d973b041bb220840c6f7450 pkg.csize=32 pkg.size=12 variant.arch=i386
-file 5ae4f5f38ad6830ce0f163e5bf925e7a22be8d1d chash=2f4af72b2265bf0c894b18067357d811c3b27c67 group=bin mode=0444 owner=root path=A1/B2/C3/D4/E5/F6/bronzeA2 pkg.chash.sha512t_256=a6e32c459da3aa0d50b89925d1cbc6db9963a8c714e873910ad25ed1c9a73e99 pkg.content-hash=file:sha512t_256:0b00671dcb481fb77388607f5aaa3f90d908f3504d973b041bb220840c6f7450 pkg.csize=32 pkg.size=12 variant.arch=sparc variant.debug=false
-file 6d8f3b9498aa3bbe7db01189b88f1b71f4ce40ad chash=6f3882864ebd7fd1a09e0e7b889fdc524c8c8bb2 group=bin mode=0444 owner=root path=etc/amber2 pkg.chash.sha512t_256=06ef53c008e21b0dae05e56358914ab0620fc97c49d9aab40bf480b105c9f936 pkg.content-hash=file:sha512t_256:affa8263da55235926301acddd6d45c97bfc530ac09873eccae8a2a052f45d95 pkg.csize=37 pkg.size=17 variant.arch=sparc variant.debug=true
-file 8264e757d4a4d8e2108a26b32edbf0412229b4d6 chash=9f0d43e4d39acd2c97a1ba8e86f3afce4d265757 group=bin mode=0444 owner=root path=etc/scheme pkg.chash.sha512t_256=cff221470e59a3520f3b9b89d8172bc706aa3af3f34aa5e7c706de144f73e78e pkg.content-hash=file:sha512t_256:d0f429df54df78c3ef31adebf47a14804598c1205531822d0571fd78dbd6fe82 pkg.csize=30 pkg.size=10 variant.arch=arm
-file 8264e757d4a4d8e2108a26b32edbf0412229b4d6 chash=9f0d43e4d39acd2c97a1ba8e86f3afce4d265757 group=bin mode=0444 owner=root path=etc/scheme pkg.chash.sha512t_256=cff221470e59a3520f3b9b89d8172bc706aa3af3f34aa5e7c706de144f73e78e pkg.content-hash=file:sha512t_256:d0f429df54df78c3ef31adebf47a14804598c1205531822d0571fd78dbd6fe82 pkg.csize=30 pkg.size=10 variant.arch=i386
-file 8535c15c49cbe1e7cb1a0bf8ff87e512abed66f8 chash=6ff2f52d2f894f5c71fb8fdd3b214e22959fccbb group=bin mode=0555 owner=root path=lib/libc.bronze pkg.chash.sha512t_256=a43a748d42d29549dce338f2e8104e95718cc19438d9a17aee78239c9349a89a pkg.content-hash=file:sha512t_256:30d1f2a7e683a2a7049217876a72dca7f782a2cac043548abe536bcd06d9ea6b pkg.csize=33 pkg.size=13
-file a268afd7e6131a2273314b397dd6232827b6152b chash=2e7390833be180b7373d90884ec1e45bd1edfa92 group=bin mode=0444 owner=root path=etc/bronze1 pkg.chash.sha512t_256=0d1778a9de63da3e3573fd374b493d5c1abfb024587a81c7f8cf51944aa36414 pkg.content-hash=file:sha512t_256:8856f57818f25706d3a8a2d98d024c1185e11a2c6149e0b95811f4b41b7a9b74 pkg.csize=31 pkg.size=11 variant.arch=arm
-file a268afd7e6131a2273314b397dd6232827b6152b chash=2e7390833be180b7373d90884ec1e45bd1edfa92 group=bin mode=0444 owner=root path=etc/bronze1 pkg.chash.sha512t_256=0d1778a9de63da3e3573fd374b493d5c1abfb024587a81c7f8cf51944aa36414 pkg.content-hash=file:sha512t_256:8856f57818f25706d3a8a2d98d024c1185e11a2c6149e0b95811f4b41b7a9b74 pkg.csize=31 pkg.size=11 variant.arch=i386
-file a268afd7e6131a2273314b397dd6232827b6152b chash=2e7390833be180b7373d90884ec1e45bd1edfa92 group=bin mode=0444 owner=root path=etc/bronze1 pkg.chash.sha512t_256=0d1778a9de63da3e3573fd374b493d5c1abfb024587a81c7f8cf51944aa36414 pkg.content-hash=file:sha512t_256:8856f57818f25706d3a8a2d98d024c1185e11a2c6149e0b95811f4b41b7a9b74 pkg.csize=31 pkg.size=11 variant.arch=sparc variant.debug=false
-file cf68b26a90cb9a0d7510f24cfb8cf6d901cec34e chash=0eb6fe69c4492f801c35dcc9175d55f783cc64a2 group=bin mode=0444 owner=root path=A1/B2/C3/D4/E5/F6/bronzeA2 pkg.chash.sha512t_256=668a84f1a74a11695d1b233712ecc6f03aff0934e8523635d4806ca11bb06f3a pkg.content-hash=file:sha512t_256:648bdc5300e3b597ac223b8220257219a5efdeee7d7401c9cbd823d958e5e585 pkg.csize=38 pkg.size=18 variant.arch=sparc variant.debug=true
+file 058b358a95c4417cb6d68eb9e37f41c063e03892 chash=69d518d352b7406393903e41f6316a01c13c53f9 group=bin mode=0444 owner=root path=etc/amber2 pkg.content-hash=file:sha512t_256:8f4b3ca9e6d12d10c937b85ccdea8d7f26f1019576388612fa86f5d610510e21 pkg.content-hash=gzip:sha512t_256:11771a626d87feca3f2b4436d992636526ca1aa7afc98e4d77a8c32fbb50896f pkg.csize=31 pkg.size=11 variant.arch=sparc variant.debug=false
+file 05fbc66156a145a81f2985a65988519ffd6bffc6 chash=e22205864f82cf4f25885280135d076bf90f0fd0 group=bin mode=0444 owner=root path=etc/tree pkg.content-hash=file:sha512t_256:96089d2295ac184fc226c6fd195ba46b8bcd7eaae68ab16de2cb7f505404219a pkg.content-hash=gzip:sha512t_256:f0d3ea47ad14f4d1e3df4c33f46d8e7ccba820d2e70ade8542dbf1f17120f2a4 pkg.csize=26 pkg.size=6 variant.arch=arm
+file 05fbc66156a145a81f2985a65988519ffd6bffc6 chash=e22205864f82cf4f25885280135d076bf90f0fd0 group=bin mode=0555 owner=root path=usr/bin/sh pkg.content-hash=file:sha512t_256:96089d2295ac184fc226c6fd195ba46b8bcd7eaae68ab16de2cb7f505404219a pkg.content-hash=gzip:sha512t_256:f0d3ea47ad14f4d1e3df4c33f46d8e7ccba820d2e70ade8542dbf1f17120f2a4 pkg.csize=26 pkg.size=6 variant.arch=arm
+file 05fbc66156a145a81f2985a65988519ffd6bffc6 chash=e22205864f82cf4f25885280135d076bf90f0fd0 group=bin mode=0555 owner=root path=usr/bin/sh pkg.content-hash=file:sha512t_256:96089d2295ac184fc226c6fd195ba46b8bcd7eaae68ab16de2cb7f505404219a pkg.content-hash=gzip:sha512t_256:f0d3ea47ad14f4d1e3df4c33f46d8e7ccba820d2e70ade8542dbf1f17120f2a4 pkg.csize=26 pkg.size=6 variant.arch=i386
+file 05fbc66156a145a81f2985a65988519ffd6bffc6 chash=e22205864f82cf4f25885280135d076bf90f0fd0 group=bin mode=0555 owner=root path=usr/bin/sh pkg.content-hash=file:sha512t_256:96089d2295ac184fc226c6fd195ba46b8bcd7eaae68ab16de2cb7f505404219a pkg.content-hash=gzip:sha512t_256:f0d3ea47ad14f4d1e3df4c33f46d8e7ccba820d2e70ade8542dbf1f17120f2a4 pkg.csize=26 pkg.size=6 variant.arch=sparc variant.debug=false
+file 1abe1a7084720f501912eceb1312ddd799fb2a34 chash=ea7230676e13986491d7405c5a9298e074930575 group=bin mode=0444 owner=root path=etc/bronze1 pkg.content-hash=file:sha512t_256:f0316c9af93368a37c837317681af5d6ac5d8fa4feab284cd952906a1689d203 pkg.content-hash=gzip:sha512t_256:012f554bf1011be581f891682a7c406156bfef7be6ad6f785db586caf3a50f48 pkg.csize=37 pkg.size=17 variant.arch=sparc variant.debug=true
+file 34f88965d55d3a730fa7683bc0f370fc6e42bf95 chash=66eebb69ee0299dcb495162336db81a3188de037 group=bin mode=0555 owner=root path=usr/bin/sh pkg.content-hash=file:sha512t_256:23589d1dbb98cc597ed74ed10e38afed113e73c30ed6dcfd98971541477f1167 pkg.content-hash=gzip:sha512t_256:5446e3eab72747cfe5e2b01fb0936a626693088d5e214dbe7af20823d76a61fb pkg.csize=32 pkg.size=12 variant.arch=sparc variant.debug=true
+file 5ae4f5f38ad6830ce0f163e5bf925e7a22be8d1d chash=2f4af72b2265bf0c894b18067357d811c3b27c67 group=bin mode=0444 owner=root path=A1/B2/C3/D4/E5/F6/bronzeA2 pkg.content-hash=file:sha512t_256:0b00671dcb481fb77388607f5aaa3f90d908f3504d973b041bb220840c6f7450 pkg.content-hash=gzip:sha512t_256:a6e32c459da3aa0d50b89925d1cbc6db9963a8c714e873910ad25ed1c9a73e99 pkg.csize=32 pkg.size=12 variant.arch=arm
+file 5ae4f5f38ad6830ce0f163e5bf925e7a22be8d1d chash=2f4af72b2265bf0c894b18067357d811c3b27c67 group=bin mode=0444 owner=root path=A1/B2/C3/D4/E5/F6/bronzeA2 pkg.content-hash=file:sha512t_256:0b00671dcb481fb77388607f5aaa3f90d908f3504d973b041bb220840c6f7450 pkg.content-hash=gzip:sha512t_256:a6e32c459da3aa0d50b89925d1cbc6db9963a8c714e873910ad25ed1c9a73e99 pkg.csize=32 pkg.size=12 variant.arch=i386
+file 5ae4f5f38ad6830ce0f163e5bf925e7a22be8d1d chash=2f4af72b2265bf0c894b18067357d811c3b27c67 group=bin mode=0444 owner=root path=A1/B2/C3/D4/E5/F6/bronzeA2 pkg.content-hash=file:sha512t_256:0b00671dcb481fb77388607f5aaa3f90d908f3504d973b041bb220840c6f7450 pkg.content-hash=gzip:sha512t_256:a6e32c459da3aa0d50b89925d1cbc6db9963a8c714e873910ad25ed1c9a73e99 pkg.csize=32 pkg.size=12 variant.arch=sparc variant.debug=false
+file 6d8f3b9498aa3bbe7db01189b88f1b71f4ce40ad chash=6f3882864ebd7fd1a09e0e7b889fdc524c8c8bb2 group=bin mode=0444 owner=root path=etc/amber2 pkg.content-hash=file:sha512t_256:affa8263da55235926301acddd6d45c97bfc530ac09873eccae8a2a052f45d95 pkg.content-hash=gzip:sha512t_256:06ef53c008e21b0dae05e56358914ab0620fc97c49d9aab40bf480b105c9f936 pkg.csize=37 pkg.size=17 variant.arch=sparc variant.debug=true
+file 8264e757d4a4d8e2108a26b32edbf0412229b4d6 chash=9f0d43e4d39acd2c97a1ba8e86f3afce4d265757 group=bin mode=0444 owner=root path=etc/scheme pkg.content-hash=file:sha512t_256:d0f429df54df78c3ef31adebf47a14804598c1205531822d0571fd78dbd6fe82 pkg.content-hash=gzip:sha512t_256:cff221470e59a3520f3b9b89d8172bc706aa3af3f34aa5e7c706de144f73e78e pkg.csize=30 pkg.size=10 variant.arch=arm
+file 8264e757d4a4d8e2108a26b32edbf0412229b4d6 chash=9f0d43e4d39acd2c97a1ba8e86f3afce4d265757 group=bin mode=0444 owner=root path=etc/scheme pkg.content-hash=file:sha512t_256:d0f429df54df78c3ef31adebf47a14804598c1205531822d0571fd78dbd6fe82 pkg.content-hash=gzip:sha512t_256:cff221470e59a3520f3b9b89d8172bc706aa3af3f34aa5e7c706de144f73e78e pkg.csize=30 pkg.size=10 variant.arch=i386
+file 8535c15c49cbe1e7cb1a0bf8ff87e512abed66f8 chash=6ff2f52d2f894f5c71fb8fdd3b214e22959fccbb group=bin mode=0555 owner=root path=lib/libc.bronze pkg.content-hash=file:sha512t_256:30d1f2a7e683a2a7049217876a72dca7f782a2cac043548abe536bcd06d9ea6b pkg.content-hash=gzip:sha512t_256:a43a748d42d29549dce338f2e8104e95718cc19438d9a17aee78239c9349a89a pkg.csize=33 pkg.size=13
+file a268afd7e6131a2273314b397dd6232827b6152b chash=2e7390833be180b7373d90884ec1e45bd1edfa92 group=bin mode=0444 owner=root path=etc/bronze1 pkg.content-hash=file:sha512t_256:8856f57818f25706d3a8a2d98d024c1185e11a2c6149e0b95811f4b41b7a9b74 pkg.content-hash=gzip:sha512t_256:0d1778a9de63da3e3573fd374b493d5c1abfb024587a81c7f8cf51944aa36414 pkg.csize=31 pkg.size=11 variant.arch=arm
+file a268afd7e6131a2273314b397dd6232827b6152b chash=2e7390833be180b7373d90884ec1e45bd1edfa92 group=bin mode=0444 owner=root path=etc/bronze1 pkg.content-hash=file:sha512t_256:8856f57818f25706d3a8a2d98d024c1185e11a2c6149e0b95811f4b41b7a9b74 pkg.content-hash=gzip:sha512t_256:0d1778a9de63da3e3573fd374b493d5c1abfb024587a81c7f8cf51944aa36414 pkg.csize=31 pkg.size=11 variant.arch=i386
+file a268afd7e6131a2273314b397dd6232827b6152b chash=2e7390833be180b7373d90884ec1e45bd1edfa92 group=bin mode=0444 owner=root path=etc/bronze1 pkg.content-hash=file:sha512t_256:8856f57818f25706d3a8a2d98d024c1185e11a2c6149e0b95811f4b41b7a9b74 pkg.content-hash=gzip:sha512t_256:0d1778a9de63da3e3573fd374b493d5c1abfb024587a81c7f8cf51944aa36414 pkg.csize=31 pkg.size=11 variant.arch=sparc variant.debug=false
+file cf68b26a90cb9a0d7510f24cfb8cf6d901cec34e chash=0eb6fe69c4492f801c35dcc9175d55f783cc64a2 group=bin mode=0444 owner=root path=A1/B2/C3/D4/E5/F6/bronzeA2 pkg.content-hash=file:sha512t_256:648bdc5300e3b597ac223b8220257219a5efdeee7d7401c9cbd823d958e5e585 pkg.content-hash=gzip:sha512t_256:668a84f1a74a11695d1b233712ecc6f03aff0934e8523635d4806ca11bb06f3a pkg.csize=38 pkg.size=18 variant.arch=sparc variant.debug=true
 hardlink path=lib/libc.bronze2.0.hardlink target=/lib/libc.so.1
-license 773b94a252723da43e8f969b4384701bcd41ce12 chash=e0715301fc211f6543ce0c444f4c34e38c70f70e license=copyright pkg.chash.sha512t_256=e9ab6146497d7525d8aaee4b506482499dcbe0c35e6b8aca38fbd3589f7ed89a pkg.content-hash=file:sha512t_256:9bfa648ff40aba0dc609156b600fadf21ba79c8983acd60f425bdae4c4b44b2f pkg.csize=40 pkg.size=20 variant.arch=sparc variant.debug=true
-license 995ad376b9c7ae79d67e673504fc4199fbfb32eb chash=9374d402ed3034a553119e179d0ae00386bb5206 license=copyright pkg.chash.sha512t_256=e4307a4d5a00e471c9adf331c2c29e00585102e2cc55d454558551aafb02eb63 pkg.content-hash=file:sha512t_256:465c63a3f18339bc1a1bda910720d697e58b9144303dbd2ad9a9ba3e30b87994 pkg.csize=34 pkg.size=14 variant.arch=arm
-license 995ad376b9c7ae79d67e673504fc4199fbfb32eb chash=9374d402ed3034a553119e179d0ae00386bb5206 license=copyright pkg.chash.sha512t_256=e4307a4d5a00e471c9adf331c2c29e00585102e2cc55d454558551aafb02eb63 pkg.content-hash=file:sha512t_256:465c63a3f18339bc1a1bda910720d697e58b9144303dbd2ad9a9ba3e30b87994 pkg.csize=34 pkg.size=14 variant.arch=i386
-license 995ad376b9c7ae79d67e673504fc4199fbfb32eb chash=9374d402ed3034a553119e179d0ae00386bb5206 license=copyright pkg.chash.sha512t_256=e4307a4d5a00e471c9adf331c2c29e00585102e2cc55d454558551aafb02eb63 pkg.content-hash=file:sha512t_256:465c63a3f18339bc1a1bda910720d697e58b9144303dbd2ad9a9ba3e30b87994 pkg.csize=34 pkg.size=14 variant.arch=sparc variant.debug=false
+license 773b94a252723da43e8f969b4384701bcd41ce12 chash=e0715301fc211f6543ce0c444f4c34e38c70f70e license=copyright pkg.content-hash=file:sha512t_256:9bfa648ff40aba0dc609156b600fadf21ba79c8983acd60f425bdae4c4b44b2f pkg.content-hash=gzip:sha512t_256:e9ab6146497d7525d8aaee4b506482499dcbe0c35e6b8aca38fbd3589f7ed89a pkg.csize=40 pkg.size=20 variant.arch=sparc variant.debug=true
+license 995ad376b9c7ae79d67e673504fc4199fbfb32eb chash=9374d402ed3034a553119e179d0ae00386bb5206 license=copyright pkg.content-hash=file:sha512t_256:465c63a3f18339bc1a1bda910720d697e58b9144303dbd2ad9a9ba3e30b87994 pkg.content-hash=gzip:sha512t_256:e4307a4d5a00e471c9adf331c2c29e00585102e2cc55d454558551aafb02eb63 pkg.csize=34 pkg.size=14 variant.arch=arm
+license 995ad376b9c7ae79d67e673504fc4199fbfb32eb chash=9374d402ed3034a553119e179d0ae00386bb5206 license=copyright pkg.content-hash=file:sha512t_256:465c63a3f18339bc1a1bda910720d697e58b9144303dbd2ad9a9ba3e30b87994 pkg.content-hash=gzip:sha512t_256:e4307a4d5a00e471c9adf331c2c29e00585102e2cc55d454558551aafb02eb63 pkg.csize=34 pkg.size=14 variant.arch=i386
+license 995ad376b9c7ae79d67e673504fc4199fbfb32eb chash=9374d402ed3034a553119e179d0ae00386bb5206 license=copyright pkg.content-hash=file:sha512t_256:465c63a3f18339bc1a1bda910720d697e58b9144303dbd2ad9a9ba3e30b87994 pkg.content-hash=gzip:sha512t_256:e4307a4d5a00e471c9adf331c2c29e00585102e2cc55d454558551aafb02eb63 pkg.csize=34 pkg.size=14 variant.arch=sparc variant.debug=false
 link path=usr/bin/jsh target=./sh
 set name=pkg.fmri value={0}
 set name=variant.arch value=i386 value=arm value=sparc
@@ -986,16 +986,16 @@
 set name=variant.debug value=false variant.arch=i386\
 """.format(self.published_debug[3]), # pkg://os.org/[email protected]
                     "scheme": """\
-file 3a06aa547ffe0186a2b9db55b8853874a048fb47 chash=ab50364de4ce8f847d765d402d80e37431e1f0aa group=bin mode=0444 owner=root path=etc/tree pkg.chash.sha512t_256=bfdce1dc4ab94f2321f2bae46505dd204b2df323df55efadf4f3b4c3326b204d pkg.content-hash=file:sha512t_256:e1152d631b4c2fda4a2b739d38e4cbc3e8d7ccf2aa5be2aef6ab776a60d5a187 pkg.csize=40 pkg.size=20 variant.debug=true
-file 3b7cee8797632f83a11b66d028016946b4fa47fa chash=00621927edeb8e5b96ef63a93b4c5d125f2a3298 group=bin mode=0444 owner=root path=etc/tree pkg.chash.sha512t_256=079a76079a1c22c13f3c2bb4b6efe8b589c1061b48e893c597c74adb62cac195 pkg.content-hash=file:sha512t_256:6650b24e5c5ceab211c95614def1ae53905a8f415f7fcfdfcc40b778041ed974 pkg.csize=34 pkg.size=14 variant.debug=false
+file 3a06aa547ffe0186a2b9db55b8853874a048fb47 chash=ab50364de4ce8f847d765d402d80e37431e1f0aa group=bin mode=0444 owner=root path=etc/tree pkg.content-hash=file:sha512t_256:e1152d631b4c2fda4a2b739d38e4cbc3e8d7ccf2aa5be2aef6ab776a60d5a187 pkg.content-hash=gzip:sha512t_256:bfdce1dc4ab94f2321f2bae46505dd204b2df323df55efadf4f3b4c3326b204d pkg.csize=40 pkg.size=20 variant.debug=true
+file 3b7cee8797632f83a11b66d028016946b4fa47fa chash=00621927edeb8e5b96ef63a93b4c5d125f2a3298 group=bin mode=0444 owner=root path=etc/tree pkg.content-hash=file:sha512t_256:6650b24e5c5ceab211c95614def1ae53905a8f415f7fcfdfcc40b778041ed974 pkg.content-hash=gzip:sha512t_256:079a76079a1c22c13f3c2bb4b6efe8b589c1061b48e893c597c74adb62cac195 pkg.csize=34 pkg.size=14 variant.debug=false
 set name=pkg.fmri value={0}
 set name=variant.arch value=sparc
 set name=variant.debug value=false value=true\
 """.format(self.published_debug[5]), # pkg://os.org/[email protected]
                     "tree": """\
-file 3a06aa547ffe0186a2b9db55b8853874a048fb47 chash=ab50364de4ce8f847d765d402d80e37431e1f0aa group=bin mode=0444 owner=root path=etc/tree pkg.chash.sha512t_256=bfdce1dc4ab94f2321f2bae46505dd204b2df323df55efadf4f3b4c3326b204d pkg.content-hash=file:sha512t_256:e1152d631b4c2fda4a2b739d38e4cbc3e8d7ccf2aa5be2aef6ab776a60d5a187 pkg.csize=40 pkg.size=20 variant.arch=sparc variant.debug=true
-file 3b7cee8797632f83a11b66d028016946b4fa47fa chash=00621927edeb8e5b96ef63a93b4c5d125f2a3298 group=bin mode=0444 owner=root path=etc/tree pkg.chash.sha512t_256=079a76079a1c22c13f3c2bb4b6efe8b589c1061b48e893c597c74adb62cac195 pkg.content-hash=file:sha512t_256:6650b24e5c5ceab211c95614def1ae53905a8f415f7fcfdfcc40b778041ed974 pkg.csize=34 pkg.size=14 variant.arch=arm
-file 3b7cee8797632f83a11b66d028016946b4fa47fa chash=00621927edeb8e5b96ef63a93b4c5d125f2a3298 group=bin mode=0444 owner=root path=etc/tree pkg.chash.sha512t_256=079a76079a1c22c13f3c2bb4b6efe8b589c1061b48e893c597c74adb62cac195 pkg.content-hash=file:sha512t_256:6650b24e5c5ceab211c95614def1ae53905a8f415f7fcfdfcc40b778041ed974 pkg.csize=34 pkg.size=14 variant.arch=sparc variant.debug=false
+file 3a06aa547ffe0186a2b9db55b8853874a048fb47 chash=ab50364de4ce8f847d765d402d80e37431e1f0aa group=bin mode=0444 owner=root path=etc/tree pkg.content-hash=file:sha512t_256:e1152d631b4c2fda4a2b739d38e4cbc3e8d7ccf2aa5be2aef6ab776a60d5a187 pkg.content-hash=gzip:sha512t_256:bfdce1dc4ab94f2321f2bae46505dd204b2df323df55efadf4f3b4c3326b204d pkg.csize=40 pkg.size=20 variant.arch=sparc variant.debug=true
+file 3b7cee8797632f83a11b66d028016946b4fa47fa chash=00621927edeb8e5b96ef63a93b4c5d125f2a3298 group=bin mode=0444 owner=root path=etc/tree pkg.content-hash=file:sha512t_256:6650b24e5c5ceab211c95614def1ae53905a8f415f7fcfdfcc40b778041ed974 pkg.content-hash=gzip:sha512t_256:079a76079a1c22c13f3c2bb4b6efe8b589c1061b48e893c597c74adb62cac195 pkg.csize=34 pkg.size=14 variant.arch=arm
+file 3b7cee8797632f83a11b66d028016946b4fa47fa chash=00621927edeb8e5b96ef63a93b4c5d125f2a3298 group=bin mode=0444 owner=root path=etc/tree pkg.content-hash=file:sha512t_256:6650b24e5c5ceab211c95614def1ae53905a8f415f7fcfdfcc40b778041ed974 pkg.content-hash=gzip:sha512t_256:079a76079a1c22c13f3c2bb4b6efe8b589c1061b48e893c597c74adb62cac195 pkg.csize=34 pkg.size=14 variant.arch=sparc variant.debug=false
 set name=pkg.fmri value={0}
 set name=variant.arch value=arm value=sparc
 set name=variant.debug value=false value=true variant.arch=sparc
@@ -1031,9 +1031,9 @@
                 repo = self.get_repo(repodir)
                 cat = repo.get_catalog(pub="os.org")
                 expected = """\
-file 1abe1a7084720f501912eceb1312ddd799fb2a34 chash=ea7230676e13986491d7405c5a9298e074930575 group=bin mode=0444 owner=root path=etc/bronze1 pkg.chash.sha512t_256=012f554bf1011be581f891682a7c406156bfef7be6ad6f785db586caf3a50f48 pkg.content-hash=file:sha512t_256:f0316c9af93368a37c837317681af5d6ac5d8fa4feab284cd952906a1689d203 pkg.csize=37 pkg.size=17 variant.arch=sparc
-file 1abe1a7084720f501912eceb1312ddd799fb2a34 chash=ea7230676e13986491d7405c5a9298e074930575 group=bin mode=0555 owner=root path=etc/bronze1 pkg.chash.sha512t_256=012f554bf1011be581f891682a7c406156bfef7be6ad6f785db586caf3a50f48 pkg.content-hash=file:sha512t_256:f0316c9af93368a37c837317681af5d6ac5d8fa4feab284cd952906a1689d203 pkg.csize=37 pkg.size=17 variant.arch=i386
-file 34f88965d55d3a730fa7683bc0f370fc6e42bf95 chash=66eebb69ee0299dcb495162336db81a3188de037 group=bin mode=0444 owner=root path=etc/tree pkg.chash.sha512t_256=5446e3eab72747cfe5e2b01fb0936a626693088d5e214dbe7af20823d76a61fb pkg.content-hash=file:sha512t_256:23589d1dbb98cc597ed74ed10e38afed113e73c30ed6dcfd98971541477f1167 pkg.csize=32 pkg.size=12
+file 1abe1a7084720f501912eceb1312ddd799fb2a34 chash=ea7230676e13986491d7405c5a9298e074930575 group=bin mode=0444 owner=root path=etc/bronze1 pkg.content-hash=file:sha512t_256:f0316c9af93368a37c837317681af5d6ac5d8fa4feab284cd952906a1689d203 pkg.content-hash=gzip:sha512t_256:012f554bf1011be581f891682a7c406156bfef7be6ad6f785db586caf3a50f48 pkg.csize=37 pkg.size=17 variant.arch=sparc
+file 1abe1a7084720f501912eceb1312ddd799fb2a34 chash=ea7230676e13986491d7405c5a9298e074930575 group=bin mode=0555 owner=root path=etc/bronze1 pkg.content-hash=file:sha512t_256:f0316c9af93368a37c837317681af5d6ac5d8fa4feab284cd952906a1689d203 pkg.content-hash=gzip:sha512t_256:012f554bf1011be581f891682a7c406156bfef7be6ad6f785db586caf3a50f48 pkg.csize=37 pkg.size=17 variant.arch=i386
+file 34f88965d55d3a730fa7683bc0f370fc6e42bf95 chash=66eebb69ee0299dcb495162336db81a3188de037 group=bin mode=0444 owner=root path=etc/tree pkg.content-hash=file:sha512t_256:23589d1dbb98cc597ed74ed10e38afed113e73c30ed6dcfd98971541477f1167 pkg.content-hash=gzip:sha512t_256:5446e3eab72747cfe5e2b01fb0936a626693088d5e214dbe7af20823d76a61fb pkg.csize=32 pkg.size=12
 set name=pkg.fmri value={0}
 set name=variant.arch value=sparc value=i386\
 """.format(self.published_blend[2])
@@ -1073,15 +1073,15 @@
                 actual = self.get_manifest(repodir)
                 expected = """\
 depend fmri=foo fmri=bar type=require-any
-file 24bb3b46361cf7d180d0227beea4f75a872b6ff4 chash=b91fb7bdd4d35779bbd70c6b0367198e48290373 group=bin mode=0444 owner=root path=etc/nondebug-notes pkg.chash.sha512t_256=8a3f3142777f861779784a776036b3baf90fde79d12378913a5078977c81a84b pkg.content-hash=file:sha512t_256:d34e775f60268293b5eb36a2a803cc0826c170259153859aefdd1abaa823b706 pkg.csize=35 pkg.size=15 variant.debug=false
-file 3a06aa547ffe0186a2b9db55b8853874a048fb47 chash=ab50364de4ce8f847d765d402d80e37431e1f0aa group=bin mode=0444 owner=root path=etc/tree pkg.chash.sha512t_256=bfdce1dc4ab94f2321f2bae46505dd204b2df323df55efadf4f3b4c3326b204d pkg.content-hash=file:sha512t_256:e1152d631b4c2fda4a2b739d38e4cbc3e8d7ccf2aa5be2aef6ab776a60d5a187 pkg.csize=40 pkg.size=20 variant.arch=sparc variant.debug=true
-file 3dfdd5c4f64e2005e7913ba8444c8ee6fa70f238 chash=05beb59e279eb2c9146c6547f1c4b94536f4b2b9 group=bin mode=0444 owner=root path=etc/binary pkg.chash.sha512t_256=7bca85fe29992f178e887674f1f0734da9cd4e5ffb92378201f9b1fd836ed540 pkg.content-hash=file:sha512t_256:ccd6abd620e8b211d5a86512b8c7489d96bf65fce9b860f3a9251dcc2d2b56d4 pkg.csize=35 pkg.size=15 variant.arch=i386 variant.debug=false
-file 4c12fa38950b7a5580c2715725f0ea980354b407 chash=61801db07f048941675ab3951cace0899b571430 group=bin mode=0444 owner=root path=etc/binary pkg.chash.sha512t_256=142a002360aa3ad87f14ad5efcf869f378462d7b73a0d32269fd55f5ee0c85df pkg.content-hash=file:sha512t_256:67d89a0369125fc599ada7d055560c1d0fbbf1e6ff94c988c638317255db8052 pkg.csize=35 pkg.size=15 variant.arch=i386 variant.debug=true
-file 6b7161cb29262ea4924a8874818da189bb70da09 chash=77e271370cec04931346c969a85d6af37c1ea83f group=bin mode=0444 owner=root path=etc/binary pkg.chash.sha512t_256=035274037f7db947b55535ff16137d9f91e2692cf425bdf080d79bef2fba78af pkg.content-hash=file:sha512t_256:4bf36eb94a392e1b7c664835a979179050f678e34b6dc99a0136cd5ee97bc810 pkg.csize=36 pkg.size=16 variant.arch=sparc variant.debug=false
-file 6b7161cb29262ea4924a8874818da189bb70da09 chash=77e271370cec04931346c969a85d6af37c1ea83f group=bin mode=0444 owner=root path=etc/everywhere-notes pkg.chash.sha512t_256=035274037f7db947b55535ff16137d9f91e2692cf425bdf080d79bef2fba78af pkg.content-hash=file:sha512t_256:4bf36eb94a392e1b7c664835a979179050f678e34b6dc99a0136cd5ee97bc810 pkg.csize=36 pkg.size=16
-file 9e837a70edd530a88c88f8a58b8a5bf2a8f3943c chash=d0323533586e1153bd1701254f45d2eb2c7eb0c4 group=bin mode=0444 owner=root path=etc/debug-notes pkg.chash.sha512t_256=3204ee62eef09b3c14d9a42771a601ef07c7784fd1a701fb03a2d85fb5034689 pkg.content-hash=file:sha512t_256:b0a71ed8510908380bcb3c5de1ca0a2e3cfbe80949fcbb17c63a1395d46f194f pkg.csize=36 pkg.size=16 variant.debug=true
-file a10f11b8559a723bea9ee0cf5980811a9d51afbb chash=9fb8079898da8a2a9faad65c8df4c4a42095f25a group=bin mode=0444 owner=root path=etc/sparc/debug-notes pkg.chash.sha512t_256=d66d5036e36bf779e5abb7649f3f6ccf6108094195c628775bf1a3750781a123 pkg.content-hash=file:sha512t_256:0fe3109ae590d0d76057bf71436e5413eafcab18f3238153dc8451a8b13059c2 pkg.csize=36 pkg.size=16 variant.arch=sparc variant.debug=true
-file aab699c6424ed1fc258b6b39eb113e624a9ee368 chash=43c3b9a83a112727264390002c3db3fcebec2e76 group=bin mode=0444 owner=root path=etc/binary pkg.chash.sha512t_256=423187fbbfca027c8e7938782009e5b215a274b6817bfe884dea68e30d67d179 pkg.content-hash=file:sha512t_256:3cc9a0b5702111d90b090ba91786f086a825ae58c4bcb76972bb90ebd1159a26 pkg.csize=36 pkg.size=16 variant.arch=sparc variant.debug=true
+file 24bb3b46361cf7d180d0227beea4f75a872b6ff4 chash=b91fb7bdd4d35779bbd70c6b0367198e48290373 group=bin mode=0444 owner=root path=etc/nondebug-notes pkg.content-hash=file:sha512t_256:d34e775f60268293b5eb36a2a803cc0826c170259153859aefdd1abaa823b706 pkg.content-hash=gzip:sha512t_256:8a3f3142777f861779784a776036b3baf90fde79d12378913a5078977c81a84b pkg.csize=35 pkg.size=15 variant.debug=false
+file 3a06aa547ffe0186a2b9db55b8853874a048fb47 chash=ab50364de4ce8f847d765d402d80e37431e1f0aa group=bin mode=0444 owner=root path=etc/tree pkg.content-hash=file:sha512t_256:e1152d631b4c2fda4a2b739d38e4cbc3e8d7ccf2aa5be2aef6ab776a60d5a187 pkg.content-hash=gzip:sha512t_256:bfdce1dc4ab94f2321f2bae46505dd204b2df323df55efadf4f3b4c3326b204d pkg.csize=40 pkg.size=20 variant.arch=sparc variant.debug=true
+file 3dfdd5c4f64e2005e7913ba8444c8ee6fa70f238 chash=05beb59e279eb2c9146c6547f1c4b94536f4b2b9 group=bin mode=0444 owner=root path=etc/binary pkg.content-hash=file:sha512t_256:ccd6abd620e8b211d5a86512b8c7489d96bf65fce9b860f3a9251dcc2d2b56d4 pkg.content-hash=gzip:sha512t_256:7bca85fe29992f178e887674f1f0734da9cd4e5ffb92378201f9b1fd836ed540 pkg.csize=35 pkg.size=15 variant.arch=i386 variant.debug=false
+file 4c12fa38950b7a5580c2715725f0ea980354b407 chash=61801db07f048941675ab3951cace0899b571430 group=bin mode=0444 owner=root path=etc/binary pkg.content-hash=file:sha512t_256:67d89a0369125fc599ada7d055560c1d0fbbf1e6ff94c988c638317255db8052 pkg.content-hash=gzip:sha512t_256:142a002360aa3ad87f14ad5efcf869f378462d7b73a0d32269fd55f5ee0c85df pkg.csize=35 pkg.size=15 variant.arch=i386 variant.debug=true
+file 6b7161cb29262ea4924a8874818da189bb70da09 chash=77e271370cec04931346c969a85d6af37c1ea83f group=bin mode=0444 owner=root path=etc/binary pkg.content-hash=file:sha512t_256:4bf36eb94a392e1b7c664835a979179050f678e34b6dc99a0136cd5ee97bc810 pkg.content-hash=gzip:sha512t_256:035274037f7db947b55535ff16137d9f91e2692cf425bdf080d79bef2fba78af pkg.csize=36 pkg.size=16 variant.arch=sparc variant.debug=false
+file 6b7161cb29262ea4924a8874818da189bb70da09 chash=77e271370cec04931346c969a85d6af37c1ea83f group=bin mode=0444 owner=root path=etc/everywhere-notes pkg.content-hash=file:sha512t_256:4bf36eb94a392e1b7c664835a979179050f678e34b6dc99a0136cd5ee97bc810 pkg.content-hash=gzip:sha512t_256:035274037f7db947b55535ff16137d9f91e2692cf425bdf080d79bef2fba78af pkg.csize=36 pkg.size=16
+file 9e837a70edd530a88c88f8a58b8a5bf2a8f3943c chash=d0323533586e1153bd1701254f45d2eb2c7eb0c4 group=bin mode=0444 owner=root path=etc/debug-notes pkg.content-hash=file:sha512t_256:b0a71ed8510908380bcb3c5de1ca0a2e3cfbe80949fcbb17c63a1395d46f194f pkg.content-hash=gzip:sha512t_256:3204ee62eef09b3c14d9a42771a601ef07c7784fd1a701fb03a2d85fb5034689 pkg.csize=36 pkg.size=16 variant.debug=true
+file a10f11b8559a723bea9ee0cf5980811a9d51afbb chash=9fb8079898da8a2a9faad65c8df4c4a42095f25a group=bin mode=0444 owner=root path=etc/sparc/debug-notes pkg.content-hash=file:sha512t_256:0fe3109ae590d0d76057bf71436e5413eafcab18f3238153dc8451a8b13059c2 pkg.content-hash=gzip:sha512t_256:d66d5036e36bf779e5abb7649f3f6ccf6108094195c628775bf1a3750781a123 pkg.csize=36 pkg.size=16 variant.arch=sparc variant.debug=true
+file aab699c6424ed1fc258b6b39eb113e624a9ee368 chash=43c3b9a83a112727264390002c3db3fcebec2e76 group=bin mode=0444 owner=root path=etc/binary pkg.content-hash=file:sha512t_256:3cc9a0b5702111d90b090ba91786f086a825ae58c4bcb76972bb90ebd1159a26 pkg.content-hash=gzip:sha512t_256:423187fbbfca027c8e7938782009e5b215a274b6817bfe884dea68e30d67d179 pkg.csize=36 pkg.size=16 variant.arch=sparc variant.debug=true
 set name=pkg.fmri value={0}
 set name=variant.arch value=sparc value=i386
 set name=variant.debug value=true value=false\
@@ -1146,13 +1146,13 @@
 
                 # the some expected manifests we should get after merging.
                 expected_osorg_scheme = """\
-file 3a06aa547ffe0186a2b9db55b8853874a048fb47 chash=ab50364de4ce8f847d765d402d80e37431e1f0aa group=bin mode=0444 owner=root path=etc/tree pkg.chash.sha512t_256=bfdce1dc4ab94f2321f2bae46505dd204b2df323df55efadf4f3b4c3326b204d pkg.content-hash=file:sha512t_256:e1152d631b4c2fda4a2b739d38e4cbc3e8d7ccf2aa5be2aef6ab776a60d5a187 pkg.csize=40 pkg.size=20
+file 3a06aa547ffe0186a2b9db55b8853874a048fb47 chash=ab50364de4ce8f847d765d402d80e37431e1f0aa group=bin mode=0444 owner=root path=etc/tree pkg.content-hash=file:sha512t_256:e1152d631b4c2fda4a2b739d38e4cbc3e8d7ccf2aa5be2aef6ab776a60d5a187 pkg.content-hash=gzip:sha512t_256:bfdce1dc4ab94f2321f2bae46505dd204b2df323df55efadf4f3b4c3326b204d pkg.csize=40 pkg.size=20
 set name=pkg.fmri value={osorg_scheme}
 set name=variant.arch value=sparc value=i386
 set name=variant.debug value=false\
 """.format(**repo15_fmris)
                 expected_osorg_tree = """\
-file 3a06aa547ffe0186a2b9db55b8853874a048fb47 chash=ab50364de4ce8f847d765d402d80e37431e1f0aa group=bin mode=0444 owner=root path=etc/tree pkg.chash.sha512t_256=bfdce1dc4ab94f2321f2bae46505dd204b2df323df55efadf4f3b4c3326b204d pkg.content-hash=file:sha512t_256:e1152d631b4c2fda4a2b739d38e4cbc3e8d7ccf2aa5be2aef6ab776a60d5a187 pkg.csize=40 pkg.size=20
+file 3a06aa547ffe0186a2b9db55b8853874a048fb47 chash=ab50364de4ce8f847d765d402d80e37431e1f0aa group=bin mode=0444 owner=root path=etc/tree pkg.content-hash=file:sha512t_256:e1152d631b4c2fda4a2b739d38e4cbc3e8d7ccf2aa5be2aef6ab776a60d5a187 pkg.content-hash=gzip:sha512t_256:bfdce1dc4ab94f2321f2bae46505dd204b2df323df55efadf4f3b4c3326b204d pkg.csize=40 pkg.size=20
 set name=pkg.fmri value={osorg_tree}
 set name=variant.arch value=sparc value=i386
 set name=variant.debug value=false\
@@ -1168,14 +1168,14 @@
 depend fmri=pkg:/[email protected] type=require variant.arch=i386
 dir group=bin mode=0755 owner=root path=etc
 dir group=bin mode=0755 owner=root path=lib
-file 1abe1a7084720f501912eceb1312ddd799fb2a34 chash=ea7230676e13986491d7405c5a9298e074930575 group=bin mode=0444 owner=root path=etc/bronze1 pkg.chash.sha512t_256=012f554bf1011be581f891682a7c406156bfef7be6ad6f785db586caf3a50f48 pkg.content-hash=file:sha512t_256:f0316c9af93368a37c837317681af5d6ac5d8fa4feab284cd952906a1689d203 pkg.csize=37 pkg.size=17
-file 34f88965d55d3a730fa7683bc0f370fc6e42bf95 chash=66eebb69ee0299dcb495162336db81a3188de037 group=bin mode=0555 owner=root path=usr/bin/sh pkg.chash.sha512t_256=5446e3eab72747cfe5e2b01fb0936a626693088d5e214dbe7af20823d76a61fb pkg.content-hash=file:sha512t_256:23589d1dbb98cc597ed74ed10e38afed113e73c30ed6dcfd98971541477f1167 pkg.csize=32 pkg.size=12
-file 6d8f3b9498aa3bbe7db01189b88f1b71f4ce40ad chash=6f3882864ebd7fd1a09e0e7b889fdc524c8c8bb2 group=bin mode=0444 owner=root path=etc/amber2 pkg.chash.sha512t_256=06ef53c008e21b0dae05e56358914ab0620fc97c49d9aab40bf480b105c9f936 pkg.content-hash=file:sha512t_256:affa8263da55235926301acddd6d45c97bfc530ac09873eccae8a2a052f45d95 pkg.csize=37 pkg.size=17 variant.arch=sparc
-file 8535c15c49cbe1e7cb1a0bf8ff87e512abed66f8 chash=6ff2f52d2f894f5c71fb8fdd3b214e22959fccbb group=bin mode=0555 owner=root path=lib/libc.bronze pkg.chash.sha512t_256=a43a748d42d29549dce338f2e8104e95718cc19438d9a17aee78239c9349a89a pkg.content-hash=file:sha512t_256:30d1f2a7e683a2a7049217876a72dca7f782a2cac043548abe536bcd06d9ea6b pkg.csize=33 pkg.size=13
-file 91fa26695f9891b2d94fd72c31b640efb5589da5 chash=4eed1e5dc5ab131812da34dc148562e6833fa92b group=bin mode=0444 owner=root path=etc/scheme pkg.chash.sha512t_256=1aaeeaeba9240732004d056619d099b4f1260147a7348f59364f05455434844e pkg.content-hash=file:sha512t_256:583b7d7ddbfbd65e04465041d487ad7e640cafa2244ead7327c7380731272b0e pkg.csize=36 pkg.size=16 variant.arch=i386
-file cf68b26a90cb9a0d7510f24cfb8cf6d901cec34e chash=0eb6fe69c4492f801c35dcc9175d55f783cc64a2 group=bin mode=0444 owner=root path=A1/B2/C3/D4/E5/F6/bronzeA2 pkg.chash.sha512t_256=668a84f1a74a11695d1b233712ecc6f03aff0934e8523635d4806ca11bb06f3a pkg.content-hash=file:sha512t_256:648bdc5300e3b597ac223b8220257219a5efdeee7d7401c9cbd823d958e5e585 pkg.csize=38 pkg.size=18
+file 1abe1a7084720f501912eceb1312ddd799fb2a34 chash=ea7230676e13986491d7405c5a9298e074930575 group=bin mode=0444 owner=root path=etc/bronze1 pkg.content-hash=file:sha512t_256:f0316c9af93368a37c837317681af5d6ac5d8fa4feab284cd952906a1689d203 pkg.content-hash=gzip:sha512t_256:012f554bf1011be581f891682a7c406156bfef7be6ad6f785db586caf3a50f48 pkg.csize=37 pkg.size=17
+file 34f88965d55d3a730fa7683bc0f370fc6e42bf95 chash=66eebb69ee0299dcb495162336db81a3188de037 group=bin mode=0555 owner=root path=usr/bin/sh pkg.content-hash=file:sha512t_256:23589d1dbb98cc597ed74ed10e38afed113e73c30ed6dcfd98971541477f1167 pkg.content-hash=gzip:sha512t_256:5446e3eab72747cfe5e2b01fb0936a626693088d5e214dbe7af20823d76a61fb pkg.csize=32 pkg.size=12
+file 6d8f3b9498aa3bbe7db01189b88f1b71f4ce40ad chash=6f3882864ebd7fd1a09e0e7b889fdc524c8c8bb2 group=bin mode=0444 owner=root path=etc/amber2 pkg.content-hash=file:sha512t_256:affa8263da55235926301acddd6d45c97bfc530ac09873eccae8a2a052f45d95 pkg.content-hash=gzip:sha512t_256:06ef53c008e21b0dae05e56358914ab0620fc97c49d9aab40bf480b105c9f936 pkg.csize=37 pkg.size=17 variant.arch=sparc
+file 8535c15c49cbe1e7cb1a0bf8ff87e512abed66f8 chash=6ff2f52d2f894f5c71fb8fdd3b214e22959fccbb group=bin mode=0555 owner=root path=lib/libc.bronze pkg.content-hash=file:sha512t_256:30d1f2a7e683a2a7049217876a72dca7f782a2cac043548abe536bcd06d9ea6b pkg.content-hash=gzip:sha512t_256:a43a748d42d29549dce338f2e8104e95718cc19438d9a17aee78239c9349a89a pkg.csize=33 pkg.size=13
+file 91fa26695f9891b2d94fd72c31b640efb5589da5 chash=4eed1e5dc5ab131812da34dc148562e6833fa92b group=bin mode=0444 owner=root path=etc/scheme pkg.content-hash=file:sha512t_256:583b7d7ddbfbd65e04465041d487ad7e640cafa2244ead7327c7380731272b0e pkg.content-hash=gzip:sha512t_256:1aaeeaeba9240732004d056619d099b4f1260147a7348f59364f05455434844e pkg.csize=36 pkg.size=16 variant.arch=i386
+file cf68b26a90cb9a0d7510f24cfb8cf6d901cec34e chash=0eb6fe69c4492f801c35dcc9175d55f783cc64a2 group=bin mode=0444 owner=root path=A1/B2/C3/D4/E5/F6/bronzeA2 pkg.content-hash=file:sha512t_256:648bdc5300e3b597ac223b8220257219a5efdeee7d7401c9cbd823d958e5e585 pkg.content-hash=gzip:sha512t_256:668a84f1a74a11695d1b233712ecc6f03aff0934e8523635d4806ca11bb06f3a pkg.csize=38 pkg.size=18
 hardlink path=lib/libc.bronze2.0.hardlink target=/lib/libc.so.1
-license 773b94a252723da43e8f969b4384701bcd41ce12 chash=e0715301fc211f6543ce0c444f4c34e38c70f70e license=copyright pkg.chash.sha512t_256=e9ab6146497d7525d8aaee4b506482499dcbe0c35e6b8aca38fbd3589f7ed89a pkg.content-hash=file:sha512t_256:9bfa648ff40aba0dc609156b600fadf21ba79c8983acd60f425bdae4c4b44b2f pkg.csize=40 pkg.size=20
+license 773b94a252723da43e8f969b4384701bcd41ce12 chash=e0715301fc211f6543ce0c444f4c34e38c70f70e license=copyright pkg.content-hash=file:sha512t_256:9bfa648ff40aba0dc609156b600fadf21ba79c8983acd60f425bdae4c4b44b2f pkg.content-hash=gzip:sha512t_256:e9ab6146497d7525d8aaee4b506482499dcbe0c35e6b8aca38fbd3589f7ed89a pkg.csize=40 pkg.size=20
 link path=usr/bin/jsh target=./sh
 set name=pkg.fmri value={altpub_bronze}
 set name=variant.arch value=sparc value=i386
@@ -1183,12 +1183,12 @@
 """.format(**repo15_fmris)
                 expected_last_gold = """\
 depend fmri=foo fmri=bar type=require-any
-file 3a06aa547ffe0186a2b9db55b8853874a048fb47 chash=ab50364de4ce8f847d765d402d80e37431e1f0aa group=bin mode=0444 owner=root path=etc/tree pkg.chash.sha512t_256=bfdce1dc4ab94f2321f2bae46505dd204b2df323df55efadf4f3b4c3326b204d pkg.content-hash=file:sha512t_256:e1152d631b4c2fda4a2b739d38e4cbc3e8d7ccf2aa5be2aef6ab776a60d5a187 pkg.csize=40 pkg.size=20 variant.arch=sparc
-file 6b7161cb29262ea4924a8874818da189bb70da09 chash=77e271370cec04931346c969a85d6af37c1ea83f group=bin mode=0444 owner=root path=etc/binary pkg.chash.sha512t_256=035274037f7db947b55535ff16137d9f91e2692cf425bdf080d79bef2fba78af pkg.content-hash=file:sha512t_256:4bf36eb94a392e1b7c664835a979179050f678e34b6dc99a0136cd5ee97bc810 pkg.csize=36 pkg.size=16 variant.arch=i386
-file 6b7161cb29262ea4924a8874818da189bb70da09 chash=77e271370cec04931346c969a85d6af37c1ea83f group=bin mode=0444 owner=root path=etc/everywhere-notes pkg.chash.sha512t_256=035274037f7db947b55535ff16137d9f91e2692cf425bdf080d79bef2fba78af pkg.content-hash=file:sha512t_256:4bf36eb94a392e1b7c664835a979179050f678e34b6dc99a0136cd5ee97bc810 pkg.csize=36 pkg.size=16
-file 9e837a70edd530a88c88f8a58b8a5bf2a8f3943c chash=d0323533586e1153bd1701254f45d2eb2c7eb0c4 group=bin mode=0444 owner=root path=etc/debug-notes pkg.chash.sha512t_256=3204ee62eef09b3c14d9a42771a601ef07c7784fd1a701fb03a2d85fb5034689 pkg.content-hash=file:sha512t_256:b0a71ed8510908380bcb3c5de1ca0a2e3cfbe80949fcbb17c63a1395d46f194f pkg.csize=36 pkg.size=16
-file a10f11b8559a723bea9ee0cf5980811a9d51afbb chash=9fb8079898da8a2a9faad65c8df4c4a42095f25a group=bin mode=0444 owner=root path=etc/sparc/debug-notes pkg.chash.sha512t_256=d66d5036e36bf779e5abb7649f3f6ccf6108094195c628775bf1a3750781a123 pkg.content-hash=file:sha512t_256:0fe3109ae590d0d76057bf71436e5413eafcab18f3238153dc8451a8b13059c2 pkg.csize=36 pkg.size=16 variant.arch=sparc
-file aab699c6424ed1fc258b6b39eb113e624a9ee368 chash=43c3b9a83a112727264390002c3db3fcebec2e76 group=bin mode=0444 owner=root path=etc/binary pkg.chash.sha512t_256=423187fbbfca027c8e7938782009e5b215a274b6817bfe884dea68e30d67d179 pkg.content-hash=file:sha512t_256:3cc9a0b5702111d90b090ba91786f086a825ae58c4bcb76972bb90ebd1159a26 pkg.csize=36 pkg.size=16 variant.arch=sparc
+file 3a06aa547ffe0186a2b9db55b8853874a048fb47 chash=ab50364de4ce8f847d765d402d80e37431e1f0aa group=bin mode=0444 owner=root path=etc/tree pkg.content-hash=file:sha512t_256:e1152d631b4c2fda4a2b739d38e4cbc3e8d7ccf2aa5be2aef6ab776a60d5a187 pkg.content-hash=gzip:sha512t_256:bfdce1dc4ab94f2321f2bae46505dd204b2df323df55efadf4f3b4c3326b204d pkg.csize=40 pkg.size=20 variant.arch=sparc
+file 6b7161cb29262ea4924a8874818da189bb70da09 chash=77e271370cec04931346c969a85d6af37c1ea83f group=bin mode=0444 owner=root path=etc/binary pkg.content-hash=file:sha512t_256:4bf36eb94a392e1b7c664835a979179050f678e34b6dc99a0136cd5ee97bc810 pkg.content-hash=gzip:sha512t_256:035274037f7db947b55535ff16137d9f91e2692cf425bdf080d79bef2fba78af pkg.csize=36 pkg.size=16 variant.arch=i386
+file 6b7161cb29262ea4924a8874818da189bb70da09 chash=77e271370cec04931346c969a85d6af37c1ea83f group=bin mode=0444 owner=root path=etc/everywhere-notes pkg.content-hash=file:sha512t_256:4bf36eb94a392e1b7c664835a979179050f678e34b6dc99a0136cd5ee97bc810 pkg.content-hash=gzip:sha512t_256:035274037f7db947b55535ff16137d9f91e2692cf425bdf080d79bef2fba78af pkg.csize=36 pkg.size=16
+file 9e837a70edd530a88c88f8a58b8a5bf2a8f3943c chash=d0323533586e1153bd1701254f45d2eb2c7eb0c4 group=bin mode=0444 owner=root path=etc/debug-notes pkg.content-hash=file:sha512t_256:b0a71ed8510908380bcb3c5de1ca0a2e3cfbe80949fcbb17c63a1395d46f194f pkg.content-hash=gzip:sha512t_256:3204ee62eef09b3c14d9a42771a601ef07c7784fd1a701fb03a2d85fb5034689 pkg.csize=36 pkg.size=16
+file a10f11b8559a723bea9ee0cf5980811a9d51afbb chash=9fb8079898da8a2a9faad65c8df4c4a42095f25a group=bin mode=0444 owner=root path=etc/sparc/debug-notes pkg.content-hash=file:sha512t_256:0fe3109ae590d0d76057bf71436e5413eafcab18f3238153dc8451a8b13059c2 pkg.content-hash=gzip:sha512t_256:d66d5036e36bf779e5abb7649f3f6ccf6108094195c628775bf1a3750781a123 pkg.csize=36 pkg.size=16 variant.arch=sparc
+file aab699c6424ed1fc258b6b39eb113e624a9ee368 chash=43c3b9a83a112727264390002c3db3fcebec2e76 group=bin mode=0444 owner=root path=etc/binary pkg.content-hash=file:sha512t_256:3cc9a0b5702111d90b090ba91786f086a825ae58c4bcb76972bb90ebd1159a26 pkg.content-hash=gzip:sha512t_256:423187fbbfca027c8e7938782009e5b215a274b6817bfe884dea68e30d67d179 pkg.csize=36 pkg.size=16 variant.arch=sparc
 set name=pkg.fmri value={last_gold}
 set name=variant.arch value=sparc value=i386
 set name=variant.debug value=false\
upstream/oracle/pkg-gate