diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-16 16:20:44 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-17 09:52:18 +0100 |
| commit | 6964f06e48c7002c9ad788aa04bd8873fb3ee024 (patch) | |
| tree | 8ab6ed8b9fb0a8a5bc40805a402ebc929c4b8a46 | |
| parent | a1190903e0a61a12c9854c96af918ae8d12c6327 (diff) | |
| download | openembedded-core-contrib-6964f06e48c7002c9ad788aa04bd8873fb3ee024.tar.gz | |
package: Fix overrides converion issue with PKGSIZE
This fixes pkgdata PKGSIZE info after the overrides change.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/license_image.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/package.bbclass | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/license_image.bbclass b/meta/classes/license_image.bbclass index 5cec7a07fa..5490d121f1 100644 --- a/meta/classes/license_image.bbclass +++ b/meta/classes/license_image.bbclass @@ -87,7 +87,7 @@ def write_license_files(d, license_manifest, pkg_dic, rootfs=True): # If the package doesn't contain any file, that is, its size is 0, the license # isn't relevant as far as the final image is concerned. So doing license check # doesn't make much sense, skip it. - if pkg_dic[pkg]["PKGSIZE_%s" % pkg] == "0": + if pkg_dic[pkg]["PKGSIZE:%s" % pkg] == "0": continue else: # Image manifest diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index fb3c346f69..e17f0c797e 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -1670,7 +1670,7 @@ fi for dfile in (d.getVar('FILERDEPENDSFLIST:' + pkg) or "").split(): write_if_exists(sf, pkg, 'FILERDEPENDS:' + dfile) - sf.write('%s_%s: %d\n' % ('PKGSIZE', pkg, total_size)) + sf.write('%s:%s: %d\n' % ('PKGSIZE', pkg, total_size)) # Symlinks needed for rprovides lookup rprov = d.getVar('RPROVIDES:%s' % pkg) or d.getVar('RPROVIDES') |