diff options
-rw-r--r-- | meta/classes/package.bbclass | 7 | ||||
-rw-r--r-- | meta/lib/oe/packagedata.py | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 84fdafa8fe..49d30caef7 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass | |||
@@ -1470,7 +1470,7 @@ PKGDATA_VARS = "PN PE PV PR PKGE PKGV PKGR LICENSE DESCRIPTION SUMMARY RDEPENDS | |||
1470 | python emit_pkgdata() { | 1470 | python emit_pkgdata() { |
1471 | from glob import glob | 1471 | from glob import glob |
1472 | import json | 1472 | import json |
1473 | import bb.compress.zstd | 1473 | import gzip |
1474 | 1474 | ||
1475 | def process_postinst_on_target(pkg, mlprefix): | 1475 | def process_postinst_on_target(pkg, mlprefix): |
1476 | pkgval = d.getVar('PKG_%s' % pkg) | 1476 | pkgval = d.getVar('PKG_%s' % pkg) |
@@ -1610,9 +1610,8 @@ fi | |||
1610 | 1610 | ||
1611 | sf.write('%s_%s: %d\n' % ('PKGSIZE', pkg, total_size)) | 1611 | sf.write('%s_%s: %d\n' % ('PKGSIZE', pkg, total_size)) |
1612 | 1612 | ||
1613 | subdata_extended_file = pkgdatadir + "/extended/%s.json.zstd" % pkg | 1613 | subdata_extended_file = pkgdatadir + "/extended/%s.json.gz" % pkg |
1614 | num_threads = int(d.getVar("BB_NUMBER_THREADS")) | 1614 | with gzip.open(subdata_extended_file, "wt", encoding="utf-8") as f: |
1615 | with bb.compress.zstd.open(subdata_extended_file, "wt", encoding="utf-8", num_threads=num_threads) as f: | ||
1616 | json.dump(extended_data, f, sort_keys=True, separators=(",", ":")) | 1615 | json.dump(extended_data, f, sort_keys=True, separators=(",", ":")) |
1617 | 1616 | ||
1618 | # Symlinks needed for rprovides lookup | 1617 | # Symlinks needed for rprovides lookup |
diff --git a/meta/lib/oe/packagedata.py b/meta/lib/oe/packagedata.py index 00f7dc1f3d..feb834c0e3 100644 --- a/meta/lib/oe/packagedata.py +++ b/meta/lib/oe/packagedata.py | |||
@@ -59,12 +59,11 @@ def read_subpkgdata_dict(pkg, d): | |||
59 | 59 | ||
60 | def read_subpkgdata_extended(pkg, d): | 60 | def read_subpkgdata_extended(pkg, d): |
61 | import json | 61 | import json |
62 | import bb.compress.zstd | 62 | import gzip |
63 | 63 | ||
64 | fn = d.expand("${PKGDATA_DIR}/extended/%s.json.zstd" % pkg) | 64 | fn = d.expand("${PKGDATA_DIR}/extended/%s.json.gz" % pkg) |
65 | try: | 65 | try: |
66 | num_threads = int(d.getVar("BB_NUMBER_THREADS")) | 66 | with gzip.open(fn, "rt", encoding="utf-8") as f: |
67 | with bb.compress.zstd.open(fn, "rt", encoding="utf-8", num_threads=num_threads) as f: | ||
68 | return json.load(f) | 67 | return json.load(f) |
69 | except FileNotFoundError: | 68 | except FileNotFoundError: |
70 | return None | 69 | return None |