mirror of
https://git.yoctoproject.org/poky
synced 2026-04-13 14:02:21 +02:00
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: 3b42c400d2d7a6ebe37429a363e1d79200f87e9b) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
2dcd72fd87
commit
7625d4121e
@@ -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]:
|
||||
|
||||
Reference in New Issue
Block a user