From 14effcc3d6bea80826808e2c30ac5d180dc67766 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Tue, 29 Aug 2017 23:21:05 +0200 Subject: [PATCH] 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 Signed-off-by: Richard Purdie --- meta/classes/toaster.bbclass | 8 ++++++++ 1 file changed, 8 insertions(+) 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]: