summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenfe-Mickael Laventure <mickael.laventure@verkada.com>2021-09-27 09:45:45 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-09-28 17:55:04 +0100
commit64ebd0d97c2552a8fca3e161df6d2a00279ab150 (patch)
tree120e5d7bf68b0e0eb7bc86ad2491e686eb90a4e9
parent0e80ffc6c83253cec4bc0888c3dbf88d4932647f (diff)
downloadpoky-64ebd0d97c2552a8fca3e161df6d2a00279ab150.tar.gz
package_ipk: Use localdata store when signing packages
When signing a package, we were resolving the `PKGV` version using the original data store (`d`). However, since that store does not have the package name in its `OVERRIDES` list the wrong version can be returned in recipes that produce multiple packages. One such example would be `external-arm-toolchain.bb`. The above issue is fixed by using `localdata` instead of `d` when resolving the needed variables. (From OE-Core rev: 2b5f01cf5a92a873ac4c3f0ba0584cab2cc05714) Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@verkada.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/package_ipk.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index 4fcb25ca70..776fe8ed23 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -230,8 +230,8 @@ def ipk_write_pkg(pkg, d):
230 shell=True) 230 shell=True)
231 231
232 if d.getVar('IPK_SIGN_PACKAGES') == '1': 232 if d.getVar('IPK_SIGN_PACKAGES') == '1':
233 ipkver = "%s-%s" % (d.getVar('PKGV'), d.getVar('PKGR')) 233 ipkver = "%s-%s" % (localdata.getVar('PKGV'), localdata.getVar('PKGR'))
234 ipk_to_sign = "%s/%s_%s_%s.ipk" % (pkgoutdir, pkgname, ipkver, d.getVar('PACKAGE_ARCH')) 234 ipk_to_sign = "%s/%s_%s_%s.ipk" % (pkgoutdir, pkgname, ipkver, localdata.getVar('PACKAGE_ARCH'))
235 sign_ipk(d, ipk_to_sign) 235 sign_ipk(d, ipk_to_sign)
236 236
237 finally: 237 finally: