summaryrefslogtreecommitdiffstats
path: root/meta/classes
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-10-07 15:10:40 +0100
commitb3cb8fb619d96cadae1821cd6b26555b73bd38a5 (patch)
tree1e57def40fc33dd55344f8f2925e89d38ee49e42 /meta/classes
parent2d0db58a89d5279a461ae735ffa06e1942108765 (diff)
downloadpoky-b3cb8fb619d96cadae1821cd6b26555b73bd38a5.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: c4724cd652b5a3adc398652b48e16d1fd1a90e89) Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@verkada.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 2b5f01cf5a92a873ac4c3f0ba0584cab2cc05714) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-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 600b3ac90c..67d6007e11 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: