diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2017-08-29 23:21:05 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-30 11:19:11 +0100 |
commit | 80c117f46442ef442e34b7681ed3688789f505ac (patch) | |
tree | b95b5450276dfbe91c40ba7da7484a2cc43bb346 | |
parent | 20684149bb659b34d3bcac8f202cb95d607567c1 (diff) | |
download | openembedded-core-contrib-80c117f46442ef442e34b7681ed3688789f505ac.tar.gz |
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)".
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/toaster.bbclass | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/meta/classes/toaster.bbclass b/meta/classes/toaster.bbclass index fbf463bbb7..6cef0b8f6e 100644 --- a/meta/classes/toaster.bbclass +++ b/meta/classes/toaster.bbclass @@ -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]: |