1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 00:20:08 +00:00

package: Fix overrides converion issue with PKGSIZE

This fixes pkgdata PKGSIZE info after the overrides change.

(From OE-Core rev: 6964f06e48c7002c9ad788aa04bd8873fb3ee024)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2021-08-16 16:20:44 +01:00
parent dd6b55d70c
commit bc65a37ef5
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -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 # 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 # isn't relevant as far as the final image is concerned. So doing license check
# doesn't make much sense, skip it. # doesn't make much sense, skip it.
if pkg_dic[pkg]["PKGSIZE_%s" % pkg] == "0": if pkg_dic[pkg]["PKGSIZE:%s" % pkg] == "0":
continue continue
else: else:
# Image manifest # Image manifest
+1 -1
View File
@@ -1670,7 +1670,7 @@ fi
for dfile in (d.getVar('FILERDEPENDSFLIST:' + pkg) or "").split(): for dfile in (d.getVar('FILERDEPENDSFLIST:' + pkg) or "").split():
write_if_exists(sf, pkg, 'FILERDEPENDS:' + dfile) 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 # Symlinks needed for rprovides lookup
rprov = d.getVar('RPROVIDES:%s' % pkg) or d.getVar('RPROVIDES') rprov = d.getVar('RPROVIDES:%s' % pkg) or d.getVar('RPROVIDES')