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

toaster.bbclass: Ignore some dependencies in toaster_buildhistory_dump() 

When using RPM, depends.dot may contain dependencies such as
"/bin/sh", which will confuse _toaster_load_pkgdatafile(). Ignore
them. While at it, also ignore dependencies that contain parentheses,
e.g., "libc.so.6(GLIBC_2.7)".

(From OE-Core rev: 80c117f46442ef442e34b7681ed3688789f505ac)

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Peter Kjellerstedt 2017-08-29 23:21:05 +02:00 committed by Richard Purdie
parent 986de4b7f0
commit 14effcc3d6
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
meta/classes/toaster.bbclass
View File

@ -279,6 +279,14 @@ python toaster_buildhistory_dump() {
dependsname = m.group('dep')
deptype = 'recommends' if m.group('rec') else 'depends'
# If RPM is used for packaging, then there may be
# dependencies such as "/bin/sh", which will confuse
# _toaster_load_pkgdatafile() later on. While at it, ignore
# any dependencies that contain parentheses, e.g.,
# "libc.so.6(GLIBC_2.7)".
if dependsname.startswith('/') or '(' in dependsname:
continue
if not pname in images[target]:
images[target][pname] = {'size': 0, 'depends' : []}
if not dependsname in images[target]: