summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-16 16:20:44 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-17 09:53:04 +0100
commitbc65a37ef50faba339fb54d6a89ef9da0298bbbe (patch)
tree14101e5d90cde6a8f0ce6aa01da0ea10800a52d5
parentdd6b55d70c0616e69ecc7366650cd0f7e1678bd8 (diff)
downloadpoky-bc65a37ef50faba339fb54d6a89ef9da0298bbbe.tar.gz
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>
-rw-r--r--meta/classes/license_image.bbclass2
-rw-r--r--meta/classes/package.bbclass2
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):
87 # If the package doesn't contain any file, that is, its size is 0, the license 87 # If the package doesn't contain any file, that is, its size is 0, the license
88 # isn't relevant as far as the final image is concerned. So doing license check 88 # isn't relevant as far as the final image is concerned. So doing license check
89 # doesn't make much sense, skip it. 89 # doesn't make much sense, skip it.
90 if pkg_dic[pkg]["PKGSIZE_%s" % pkg] == "0": 90 if pkg_dic[pkg]["PKGSIZE:%s" % pkg] == "0":
91 continue 91 continue
92 else: 92 else:
93 # Image manifest 93 # 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
1670 for dfile in (d.getVar('FILERDEPENDSFLIST:' + pkg) or "").split(): 1670 for dfile in (d.getVar('FILERDEPENDSFLIST:' + pkg) or "").split():
1671 write_if_exists(sf, pkg, 'FILERDEPENDS:' + dfile) 1671 write_if_exists(sf, pkg, 'FILERDEPENDS:' + dfile)
1672 1672
1673 sf.write('%s_%s: %d\n' % ('PKGSIZE', pkg, total_size)) 1673 sf.write('%s:%s: %d\n' % ('PKGSIZE', pkg, total_size))
1674 1674
1675 # Symlinks needed for rprovides lookup 1675 # Symlinks needed for rprovides lookup
1676 rprov = d.getVar('RPROVIDES:%s' % pkg) or d.getVar('RPROVIDES') 1676 rprov = d.getVar('RPROVIDES:%s' % pkg) or d.getVar('RPROVIDES')