@@ -1470,7 +1470,7 @@ PKGDATA_VARS = "PN PE PV PR PKGE PKGV PKGR LICENSE DESCRIPTION SUMMARY RDEPENDS
python emit_pkgdata() {
from glob import glob
import json
- import bb.compress.zstd
+ import gzip
def process_postinst_on_target(pkg, mlprefix):
pkgval = d.getVar('PKG_%s' % pkg)
@@ -1610,9 +1610,8 @@ fi
sf.write('%s_%s: %d\n' % ('PKGSIZE', pkg, total_size))
- subdata_extended_file = pkgdatadir + "/extended/%s.json.zstd" % pkg
- num_threads = int(d.getVar("BB_NUMBER_THREADS"))
- with bb.compress.zstd.open(subdata_extended_file, "wt", encoding="utf-8", num_threads=num_threads) as f:
+ subdata_extended_file = pkgdatadir + "/extended/%s.json.gz" % pkg
+ with gzip.open(subdata_extended_file, "wt", encoding="utf-8") as f:
json.dump(extended_data, f, sort_keys=True, separators=(",", ":"))
# Symlinks needed for rprovides lookup
@@ -59,12 +59,11 @@ def read_subpkgdata_dict(pkg, d):
def read_subpkgdata_extended(pkg, d):
import json
- import bb.compress.zstd
+ import gzip
- fn = d.expand("${PKGDATA_DIR}/extended/%s.json.zstd" % pkg)
+ fn = d.expand("${PKGDATA_DIR}/extended/%s.json.gz" % pkg)
try:
- num_threads = int(d.getVar("BB_NUMBER_THREADS"))
- with bb.compress.zstd.open(fn, "rt", encoding="utf-8", num_threads=num_threads) as f:
+ with gzip.open(fn, "rt", encoding="utf-8") as f:
return json.load(f)
except FileNotFoundError:
return None
The master version of extended package data uses zstd for efficient compression, but it relies on the zstd tool to be present on the host system. Since dunfell supports older distros, we don't want to add this tool as an additional requirement so switch to using gzip instead. Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> --- meta/classes/package.bbclass | 7 +++---- meta/lib/oe/packagedata.py | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-)