diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-04-28 15:15:04 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-05-12 16:44:05 +0100 |
| commit | 983c257517629d40ee00e09d5e23c00983a55cf4 (patch) | |
| tree | 00d048ba0365302a1982482378070d280faf6793 /meta | |
| parent | 5e0de3463e8b9d6e61aff6f875a05cde506e80d2 (diff) | |
| download | poky-983c257517629d40ee00e09d5e23c00983a55cf4.tar.gz | |
lib/sstatesig: Fix find_siginfo to match sstate filename generation
sstate filename generation was changed a while ago and taskname has to be
passed into core functions for the correct filename to be generated. Update
find_siginfo to match those changes and pass in taskname via SSTATE_CURRTASK.
Thanks to Gregory Lumen <gregorylumen@microsoft.com> for spotting.
[YOCTO #14774]
(From OE-Core rev: 3230134c0e5654afccf4f8831ab1101615502162)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 51d7310b6cf8ef9033d461868c07f686656070ba)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/lib/oe/sstatesig.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 2cf858e201..7150bd0929 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py | |||
| @@ -382,13 +382,13 @@ def find_siginfo(pn, taskname, taskhashlist, d): | |||
| 382 | localdata.setVar('PV', '*') | 382 | localdata.setVar('PV', '*') |
| 383 | localdata.setVar('PR', '*') | 383 | localdata.setVar('PR', '*') |
| 384 | localdata.setVar('BB_TASKHASH', hashval) | 384 | localdata.setVar('BB_TASKHASH', hashval) |
| 385 | localdata.setVar('SSTATE_CURRTASK', taskname[3:]) | ||
| 385 | swspec = localdata.getVar('SSTATE_SWSPEC') | 386 | swspec = localdata.getVar('SSTATE_SWSPEC') |
| 386 | if taskname in ['do_fetch', 'do_unpack', 'do_patch', 'do_populate_lic', 'do_preconfigure'] and swspec: | 387 | if taskname in ['do_fetch', 'do_unpack', 'do_patch', 'do_populate_lic', 'do_preconfigure'] and swspec: |
| 387 | localdata.setVar('SSTATE_PKGSPEC', '${SSTATE_SWSPEC}') | 388 | localdata.setVar('SSTATE_PKGSPEC', '${SSTATE_SWSPEC}') |
| 388 | elif pn.endswith('-native') or "-cross-" in pn or "-crosssdk-" in pn: | 389 | elif pn.endswith('-native') or "-cross-" in pn or "-crosssdk-" in pn: |
| 389 | localdata.setVar('SSTATE_EXTRAPATH', "${NATIVELSBSTRING}/") | 390 | localdata.setVar('SSTATE_EXTRAPATH', "${NATIVELSBSTRING}/") |
| 390 | sstatename = taskname[3:] | 391 | filespec = '%s.siginfo' % localdata.getVar('SSTATE_PKG') |
| 391 | filespec = '%s_%s.*.siginfo' % (localdata.getVar('SSTATE_PKG'), sstatename) | ||
| 392 | 392 | ||
| 393 | matchedfiles = glob.glob(filespec) | 393 | matchedfiles = glob.glob(filespec) |
| 394 | for fullpath in matchedfiles: | 394 | for fullpath in matchedfiles: |
