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>

diff --git a/meta/classes/license_image.bbclass b/meta/classes/license_image.bbclass
index 5cec7a07fa253bfc5e10886b8d8bd6a438d90248..5490d121f173785477559120df93e19b2ff684b4 100644 (file)
--- 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 fb3c346f692a491f75c323dba938db7e4682d473..e17f0c797e330ecc802951eba0a8da0b794862b8 100644 (file)
--- 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')