[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6257/8267] toaster.bbclass: Ignore some dependencies in toaster_buildhistory_dump()
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous-yocto/gnomeostree-3.28-rocko: 6257/8267] toaster.bbclass: Ignore some dependencies in toaster_buildhistory_dump()
- Date: Sun, 17 Dec 2017 04:35:28 +0000 (UTC)
commit 7625d4121eee0d430e38c65d8e4db0462d7a8aef
Author: Peter Kjellerstedt <peter kjellerstedt axis com>
Date: Fri Jun 9 21:34:29 2017 +0200
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>
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 fbf463b..6cef0b8 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]:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]