diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-16 16:01:06 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-17 09:52:18 +0100 |
| commit | a1190903e0a61a12c9854c96af918ae8d12c6327 (patch) | |
| tree | e70fd8d865f322c0827c5671fecec15afe9892cf /scripts/lib/devtool | |
| parent | 72a9ddf85876909d6f22582561a6e1c3a2ccf2fa (diff) | |
| download | openembedded-core-contrib-a1190903e0a61a12c9854c96af918ae8d12c6327.tar.gz | |
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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/devtool')
| -rw-r--r-- | scripts/lib/devtool/search.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/lib/devtool/search.py b/scripts/lib/devtool/search.py index d81cdd876f..70b81cac5e 100644 --- a/scripts/lib/devtool/search.py +++ b/scripts/lib/devtool/search.py @@ -62,10 +62,11 @@ def search(args, config, basepath, workspace): with open(os.path.join(pkgdata_dir, 'runtime', pkg), 'r') as f: for line in f: if ': ' in line: - splitline = line.split(':', 1) + splitline = line.split(': ', 1) key = splitline[0] value = splitline[1].strip() - if key in ['PKG:%s' % pkg, 'DESCRIPTION', 'FILES_INFO'] or key.startswith('FILERPROVIDES_'): + key = key.replace(":" + pkg, "") + if key in ['PKG', 'DESCRIPTION', 'FILES_INFO', 'FILERPROVIDES']: if keyword_rc.search(value): match = True break |