diff options
| author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2017-06-09 21:34:29 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-06-12 15:17:50 +0100 |
| commit | 3b42c400d2d7a6ebe37429a363e1d79200f87e9b (patch) | |
| tree | 1166a956bab8aa405aadee937764e5d0b48d0090 | |
| parent | 49a321d03e527ad15c3a7fcb9d94980577535ca3 (diff) | |
| download | openembedded-core-3b42c400d2d7a6ebe37429a363e1d79200f87e9b.tar.gz openembedded-core-3b42c400d2d7a6ebe37429a363e1d79200f87e9b.tar.bz2 openembedded-core-3b42c400d2d7a6ebe37429a363e1d79200f87e9b.zip | |
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]: |