From dd6b55d70c0616e69ecc7366650cd0f7e1678bd8 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 16 Aug 2021 16:01:06 +0100 Subject: package/scripts: Fix FILES_INFO handling There is a long standing bug where FILES_INFO isn't written into pkgdata with a package suffix. This means if the files are read into the datastore as intended, the last one "wins". Fix this to work as intended. Most of the call sites using the data need to be updated to handle this and the overrides change correctly. Also fix some other problematic references noticed along the way. (From OE-Core rev: a1190903e0a61a12c9854c96af918ae8d12c6327) Signed-off-by: Richard Purdie --- meta/classes/insane.bbclass | 4 ++-- meta/classes/package.bbclass | 2 +- meta/classes/toaster.bbclass | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'meta') diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 810459d432..b84e6035ed 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -808,11 +808,11 @@ def package_qa_check_rdepends(pkg, pkgdest, skip, taskdeps, packages, d): # For Saving the FILERPROVIDES, RPROVIDES and FILES_INFO rdep_data = oe.packagedata.read_subpkgdata(rdep, d) for key in rdep_data: - if key.startswith("FILERPROVIDES_") or key.startswith("RPROVIDES:"): + if key.startswith("FILERPROVIDES:") or key.startswith("RPROVIDES:"): for subkey in bb.utils.explode_deps(rdep_data[key]): filerdepends.pop(subkey,None) # Add the files list to the rprovides - if key == "FILES_INFO": + if key.startswith("FILES_INFO:"): # Use eval() to make it as a dict for subkey in eval(rdep_data[key]): filerdepends.pop(subkey,None) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index a9138ff6be..fb3c346f69 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -1652,7 +1652,7 @@ fi if fstat.st_ino not in seen: seen.add(fstat.st_ino) total_size += fstat.st_size - d.setVar('FILES_INFO', json.dumps(files, sort_keys=True)) + d.setVar('FILES_INFO:' + pkg , json.dumps(files, sort_keys=True)) process_postinst_on_target(pkg, d.getVar("MLPREFIX")) add_set_e_to_scriptlets(pkg) diff --git a/meta/classes/toaster.bbclass b/meta/classes/toaster.bbclass index 9518ddf7a4..dd5c7f224b 100644 --- a/meta/classes/toaster.bbclass +++ b/meta/classes/toaster.bbclass @@ -106,7 +106,7 @@ def _toaster_load_pkgdatafile(dirpath, filepath): pkgdata['OPKGN'] = m.group(1) kn = "_".join([x for x in kn.split("_") if x.isupper()]) pkgdata[kn] = kv.strip() - if kn == 'FILES_INFO': + if kn.startswith('FILES_INFO'): pkgdata[kn] = json.loads(kv) except ValueError: -- cgit v1.2.3-54-g00ecf