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-31 17:57:11 +0100 |
commit | 14effcc3d6bea80826808e2c30ac5d180dc67766 (patch) | |
tree | 2c44163307c5efcdc104a94d20d7fb8bafef40d4 /meta | |
parent | 986de4b7f0216843277d21e7aac96f750da2c6b3 (diff) | |
download | poky-14effcc3d6bea80826808e2c30ac5d180dc67766.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)".
(From OE-Core rev: 80c117f46442ef442e34b7681ed3688789f505ac)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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() { | |||
279 | dependsname = m.group('dep') | 279 | dependsname = m.group('dep') |
280 | deptype = 'recommends' if m.group('rec') else 'depends' | 280 | deptype = 'recommends' if m.group('rec') else 'depends' |
281 | 281 | ||
282 | # If RPM is used for packaging, then there may be | ||
283 | # dependencies such as "/bin/sh", which will confuse | ||
284 | # _toaster_load_pkgdatafile() later on. While at it, ignore | ||
285 | # any dependencies that contain parentheses, e.g., | ||
286 | # "libc.so.6(GLIBC_2.7)". | ||
287 | if dependsname.startswith('/') or '(' in dependsname: | ||
288 | continue | ||
289 | |||
282 | if not pname in images[target]: | 290 | if not pname in images[target]: |
283 | images[target][pname] = {'size': 0, 'depends' : []} | 291 | images[target][pname] = {'size': 0, 'depends' : []} |
284 | if not dependsname in images[target]: | 292 | if not dependsname in images[target]: |