sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

classes/buildhistory: fix reading of package-specific values from pkgdata 

When writing out variable values to pkgdata, if the value has been set
in the datastore with an override for the package, we use the package
name override in the pkgdata key as well; however the recently added
code to read pkgdata in buildhistory.bbclass was just using the override
where we normally expect to have it. However, if a recipe overrides one
of the values that is normally set for the recipe on a per-package basis
(e.g. the external-sourcery-toolchain recipe sets PKGV this way) then
this led to KeyErrors. Re-write the pkgdata loading code to always strip
off the package name override if it is present.

(From OE-Core rev: e40e8e574b3688400a668d3ad76b6cef1920e3e0)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Paul Eggleton 2013-12-05 11:11:47 +00:00 committed by Richard Purdie
parent b2a9b9152b
commit 5c69ae26cd
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
meta/classes/buildhistory.bbclass
View File

@ -187,7 +187,10 @@ python buildhistory_emit_pkghistory() {
with open(os.path.join(pkgdata_dir, 'runtime', pkg)) as f:
for line in f.readlines():
item = line.rstrip('\n').split(': ', 1)
pkgdata[item[0]] = item[1].decode('string_escape')
key = item[0]
if key.endswith('_' + pkg):
key = key[:-len(pkg)-1]
pkgdata[key] = item[1].decode('string_escape')
pkge = pkgdata.get('PKGE', '0')
pkgv = pkgdata['PKGV']
@ -211,19 +214,19 @@ python buildhistory_emit_pkghistory() {
pkginfo.pe = pkgdata.get('PE', '0')
pkginfo.pv = pkgdata['PV']
pkginfo.pr = pkgdata['PR']
pkginfo.pkg = pkgdata['PKG_%s' % pkg]
pkginfo.pkg = pkgdata['PKG']
pkginfo.pkge = pkge
pkginfo.pkgv = pkgv
pkginfo.pkgr = pkgr
pkginfo.rprovides = sortpkglist(squashspaces(pkgdata.get('RPROVIDES_%s' % pkg, "")))
pkginfo.rdepends = sortpkglist(squashspaces(pkgdata.get('RDEPENDS_%s' % pkg, "")))
pkginfo.rrecommends = sortpkglist(squashspaces(pkgdata.get('RRECOMMENDS_%s' % pkg, "")))
pkginfo.rsuggests = sortpkglist(squashspaces(pkgdata.get('RSUGGESTS_%s' % pkg, "")))
pkginfo.rreplaces = sortpkglist(squashspaces(pkgdata.get('RREPLACES_%s' % pkg, "")))
pkginfo.rconflicts = sortpkglist(squashspaces(pkgdata.get('RCONFLICTS_%s' % pkg, "")))
pkginfo.files = squashspaces(pkgdata.get('FILES_%s' % pkg, ""))
pkginfo.rprovides = sortpkglist(squashspaces(pkgdata.get('RPROVIDES', "")))
pkginfo.rdepends = sortpkglist(squashspaces(pkgdata.get('RDEPENDS', "")))
pkginfo.rrecommends = sortpkglist(squashspaces(pkgdata.get('RRECOMMENDS', "")))
pkginfo.rsuggests = sortpkglist(squashspaces(pkgdata.get('RSUGGESTS', "")))
pkginfo.rreplaces = sortpkglist(squashspaces(pkgdata.get('RREPLACES', "")))
pkginfo.rconflicts = sortpkglist(squashspaces(pkgdata.get('RCONFLICTS', "")))
pkginfo.files = squashspaces(pkgdata.get('FILES', ""))
for filevar in pkginfo.filevars:
pkginfo.filevars[filevar] = pkgdata.get('%s_%s' % (filevar, pkg), "")
pkginfo.filevars[filevar] = pkgdata.get(filevar, "")
# Gather information about packaged files
val = pkgdata.get('FILES_INFO', '')
@ -232,7 +235,7 @@ python buildhistory_emit_pkghistory() {
filelist.sort()
pkginfo.filelist = " ".join(filelist)
pkginfo.size = int(pkgdata['PKGSIZE_%s' % pkg])
pkginfo.size = int(pkgdata['PKGSIZE'])
write_pkghistory(pkginfo, d)
}