summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2017-06-09 21:34:29 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-12 23:01:22 +0100
commit7625d4121eee0d430e38c65d8e4db0462d7a8aef (patch)
treec5e128b192776af9ac11cc250eda88e7aa79b642 /meta
parent2dcd72fd873dfcd0e4dcf789d9b194b73b91049c (diff)
downloadpoky-7625d4121eee0d430e38c65d8e4db0462d7a8aef.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: 3b42c400d2d7a6ebe37429a363e1d79200f87e9b) 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.bbclass8
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]: