diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2023-10-23 13:06:17 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-10-27 10:53:43 +0100 |
| commit | 2cf13f251392dd31c55ef49ed8ba037ac4216934 (patch) | |
| tree | ea970335ce6fd8340996ff1c02d0529774a57f5d /meta/lib/oeqa | |
| parent | 2187e823ad66eaaee6a4ed7d748f2c68028a45e7 (diff) | |
| download | poky-2cf13f251392dd31c55ef49ed8ba037ac4216934.tar.gz | |
lib/oe/sstatesig.py: dump locked.sigs.inc only when explicitly asked via -S lockedsigs
This was writing out locked-sigs.inc into cwd with every
'bitbake -S' invocation. When the intent is only to to get task
stamps (-S none), or print the difference between them (-S printdiff),
the file is unnecessary clutter.
A couple of selftests/scripts were however relying on this, so they're
adjusted to explicitly request the file.
eSDK code calls dump_lockedsigs() separately via
oe.copy_buildsystem.generate_locked_sigs() and so isn't affected.
(From OE-Core rev: ad57c3cac2a8d3e60222e3cca0685f582dcea135)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa')
| -rw-r--r-- | meta/lib/oeqa/selftest/cases/archiver.py | 2 | ||||
| -rw-r--r-- | meta/lib/oeqa/selftest/cases/signing.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/selftest/cases/archiver.py b/meta/lib/oeqa/selftest/cases/archiver.py index 3fa59fff51..3cb888c506 100644 --- a/meta/lib/oeqa/selftest/cases/archiver.py +++ b/meta/lib/oeqa/selftest/cases/archiver.py | |||
| @@ -141,7 +141,7 @@ class Archiver(OESelftestTestCase): | |||
| 141 | pn = 'gcc-source-%s' % get_bb_vars(['PV'], 'gcc')['PV'] | 141 | pn = 'gcc-source-%s' % get_bb_vars(['PV'], 'gcc')['PV'] |
| 142 | 142 | ||
| 143 | # Generate the tasks signatures | 143 | # Generate the tasks signatures |
| 144 | bitbake('mc:mc1:%s mc:mc2:%s -c %s -S none' % (pn, pn, task)) | 144 | bitbake('mc:mc1:%s mc:mc2:%s -c %s -S lockedsigs' % (pn, pn, task)) |
| 145 | 145 | ||
| 146 | # Check the tasks signatures | 146 | # Check the tasks signatures |
| 147 | # To be machine agnostic the tasks needs to generate the same signature for each machine | 147 | # To be machine agnostic the tasks needs to generate the same signature for each machine |
diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py index 322e753ed3..18cce0ba25 100644 --- a/meta/lib/oeqa/selftest/cases/signing.py +++ b/meta/lib/oeqa/selftest/cases/signing.py | |||
| @@ -191,7 +191,7 @@ class LockedSignatures(OESelftestTestCase): | |||
| 191 | 191 | ||
| 192 | bitbake(test_recipe) | 192 | bitbake(test_recipe) |
| 193 | # Generate locked sigs include file | 193 | # Generate locked sigs include file |
| 194 | bitbake('-S none %s' % test_recipe) | 194 | bitbake('-S lockedsigs %s' % test_recipe) |
| 195 | 195 | ||
| 196 | feature = 'require %s\n' % locked_sigs_file | 196 | feature = 'require %s\n' % locked_sigs_file |
| 197 | feature += 'SIGGEN_LOCKEDSIGS_TASKSIG_CHECK = "warn"\n' | 197 | feature += 'SIGGEN_LOCKEDSIGS_TASKSIG_CHECK = "warn"\n' |
