From: Paul Barker <paul@pbarker.dev>
To: openembedded-core@lists.openembedded.org
Cc: Paul Barker <paul@pbarker.dev>
Subject: [PATCH v2 1/8] checklayer: Fix regex in get_signatures
Date: Thu, 19 Mar 2026 16:04:39 +0000 [thread overview]
Message-ID: <20260319-fix-checklayer-2-v2-1-38ffe8df4c28@pbarker.dev> (raw)
In-Reply-To: <20260319-fix-checklayer-2-v2-0-38ffe8df4c28@pbarker.dev>
After commit 11373def3171 ("sstatesig/populate_sdk_ext: Improve unihash
cache handling") in openembedded-core, the locked-sigs.inc file may
contain unihash map entries as well as a list of locked sigs. The
unihash map entries consist of four fields separated by `:` - pn, task,
task hash and unihash. The current regex in get_signatures cannot parse
these correctly, it grabs the first 3 elements into <task> when there
should only be two elements, leading to an error:
Traceback (most recent call last):
File "/srv/pokybuild/yocto-worker/check-layer/build/layers/openembedded-core/scripts/yocto-check-layer", line 252, in <module>
ret = main()
File "/srv/pokybuild/yocto-worker/check-layer/build/layers/openembedded-core/scripts/yocto-check-layer", line 215, in main
td['sigs'], td['tunetasks'] = get_signatures(td['builddir'])
~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^
File "/srv/pokybuild/yocto-worker/check-layer/build/layers/openembedded-core/scripts/lib/checklayer/__init__.py", line 340, in get_signatures
(recipe, task) = s.group('task').split(':')
^^^^^^^^^^^^^^
ValueError: too many values to unpack (expected 2)
Modify the regex so that it doesn't accidentally pick up the third field
of the unihash map entries.
Signed-off-by: Paul Barker <paul@pbarker.dev>
---
scripts/lib/checklayer/__init__.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/lib/checklayer/__init__.py b/scripts/lib/checklayer/__init__.py
index b70cef1b1441..15459b6e0486 100644
--- a/scripts/lib/checklayer/__init__.py
+++ b/scripts/lib/checklayer/__init__.py
@@ -324,7 +324,7 @@ def get_signatures(builddir, failsafe=False, machine=None, extravars=None):
else:
raise
- sig_regex = re.compile(r"^(?P<task>.*:.*):(?P<hash>.*) .$")
+ sig_regex = re.compile(r"^(?P<task>[^:]*:[^:]*):(?P<hash>.*) .$")
tune_regex = re.compile(r"(^|\s)SIGGEN_LOCKEDSIGS_t-(?P<tune>\S*)\s*=\s*")
current_tune = None
with open(sigs_file, 'r') as f:
--
2.43.0
next prev parent reply other threads:[~2026-03-19 16:05 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-19 16:04 [PATCH v2 0/8] Further check-layer fixes Paul Barker
2026-03-19 16:04 ` Paul Barker [this message]
2026-03-19 16:04 ` [PATCH v2 2/8] curl: Drop arch dependent search paths Paul Barker
2026-03-19 16:04 ` [PATCH v2 3/8] ghostscript: " Paul Barker
2026-03-19 16:04 ` [PATCH v2 4/8] libssh2: " Paul Barker
2026-03-19 16:04 ` [PATCH v2 5/8] flac: Use arch independent search path Paul Barker
2026-03-19 16:04 ` [PATCH v2 6/8] gettext: Use arch independent search paths Paul Barker
2026-03-19 16:04 ` [PATCH v2 7/8] gnutls: " Paul Barker
2026-03-19 16:04 ` [PATCH v2 8/8] initscripts: Make SRC_URI arch independent Paul Barker
2026-03-21 14:55 ` [OE-core] [PATCH v2 0/8] Further check-layer fixes Peter Kjellerstedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260319-fix-checklayer-2-v2-1-38ffe8df4c28@pbarker.dev \
--to=paul@pbarker.dev \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox