diff options
| -rw-r--r-- | meta/classes/toaster.bbclass | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/meta/classes/toaster.bbclass b/meta/classes/toaster.bbclass index 296e4764f0..fbf463bbb7 100644 --- a/meta/classes/toaster.bbclass +++ b/meta/classes/toaster.bbclass | |||
| @@ -270,22 +270,20 @@ python toaster_buildhistory_dump() { | |||
| 270 | images[target][pname.strip()] = {'size':int(psize)*1024, 'depends' : []} | 270 | images[target][pname.strip()] = {'size':int(psize)*1024, 'depends' : []} |
| 271 | 271 | ||
| 272 | with open("%s/depends.dot" % installed_img_path, "r") as fin: | 272 | with open("%s/depends.dot" % installed_img_path, "r") as fin: |
| 273 | p = re.compile(r' -> ') | 273 | p = re.compile(r'\s*"(?P<name>[^"]+)"\s*->\s*"(?P<dep>[^"]+)"(?P<rec>.*?\[style=dotted\])?') |
| 274 | dot = re.compile(r'.*style=dotted') | ||
| 275 | for line in fin: | 274 | for line in fin: |
| 276 | line = line.rstrip(';') | 275 | m = p.match(line) |
| 277 | linesplit = p.split(line) | 276 | if not m: |
| 278 | if len(linesplit) == 2: | 277 | continue |
| 279 | pname = linesplit[0].rstrip('"').strip('"') | 278 | pname = m.group('name') |
| 280 | dependsname = linesplit[1].split(" ")[0].strip().strip(";").strip('"').rstrip('"') | 279 | dependsname = m.group('dep') |
| 281 | deptype = "depends" | 280 | deptype = 'recommends' if m.group('rec') else 'depends' |
| 282 | if dot.match(line): | 281 | |
| 283 | deptype = "recommends" | 282 | if not pname in images[target]: |
| 284 | if not pname in images[target]: | 283 | images[target][pname] = {'size': 0, 'depends' : []} |
| 285 | images[target][pname] = {'size': 0, 'depends' : []} | 284 | if not dependsname in images[target]: |
| 286 | if not dependsname in images[target]: | 285 | images[target][dependsname] = {'size': 0, 'depends' : []} |
| 287 | images[target][dependsname] = {'size': 0, 'depends' : []} | 286 | images[target][pname]['depends'].append((dependsname, deptype)) |
| 288 | images[target][pname]['depends'].append((dependsname, deptype)) | ||
| 289 | 287 | ||
| 290 | # files-in-image.txt is only generated if an image file is created, | 288 | # files-in-image.txt is only generated if an image file is created, |
| 291 | # so the file entries ('syms', 'dirs', 'files') for a target will be | 289 | # so the file entries ('syms', 'dirs', 'files') for a target will be |