From: "S. Lockwood-Childs" <sjl@vctlabs.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH] buildhistory.bbclass: fix regression from FILES_INFO changes
Date: Tue, 16 Nov 2021 17:06:34 -0800 [thread overview]
Message-ID: <20211117010634.GI13720@codepurple> (raw)
Started getting a stack trace during packagedata task for a
recipe that built fine in hardknott
*** 0002:buildhistory_emit_pkghistory(d)
0003:
File: 'meta/classes/buildhistory.bbclass', lineno: 313, function: buildhistory_emit_pkghistory
0309: pkginfo.filevars[filevar] = localdata.getVar(filevar) or ""
0310:
0311: # Gather information about packaged files
0312: val = localdata.getVar('FILES_INFO') or ''
*** 0313: dictval = json.loads(val)
0314: filelist = list(dictval.keys())
0315: filelist.sort()
0316: pkginfo.filelist = " ".join([shlex.quote(x) for x in filelist])
...
Exception: json.decoder.JSONDecodeError: Expecting value: line 1 column 1 (char 0)
which turns out to mean FILES_INFO is undefined for the main package built by
this recipe (FILES_INFO lookup for other packages such as -dev seemed to work fine).
Tracked the regression down to this commit:
package/scripts: Fix FILES_INFO handling
OE-Core rev: a1190903e0a61a12c9854c96af918ae8d12c6327
If buildhistory.bbclass uses the same per-package syntax to read
FILES_INFO as package.bbclass uses now when setting it, then
this regression goes away.
Signed-off-by: S. Lockwood-Childs <sjl@vctlabs.com>
---
meta/classes/buildhistory.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index 7c44fec2d1..99300ab431 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -309,7 +309,7 @@ python buildhistory_emit_pkghistory() {
pkginfo.filevars[filevar] = localdata.getVar(filevar) or ""
# Gather information about packaged files
- val = localdata.getVar('FILES_INFO') or ''
+ val = localdata.getVar('FILES_INFO:%s' % pkg) or ''
dictval = json.loads(val)
filelist = list(dictval.keys())
filelist.sort()
--
2.20.1
next reply other threads:[~2021-11-17 1:06 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-17 1:06 S. Lockwood-Childs [this message]
2021-11-19 10:36 ` [OE-core] [PATCH] buildhistory.bbclass: fix regression from FILES_INFO changes Richard Purdie
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=20211117010634.GI13720@codepurple \
--to=sjl@vctlabs.com \
--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