toaster.bbclass: only scan files-in-image.txt if it exists
We can reach the method in toaster.bbclass which tries to read from the files-in-image.txt file via a build which doesn't create that file (e.g. "bitbake core-image-minimal -c rootfs"). This causes the build to fail with an exception. Check that this file exists before trying to read from it. [YOCTO #9784] (From OE-Core rev: 8b369cdd73ab17cdf834a591b97b25840caeb740) Signed-off-by: Elliot Smith <elliot.smith@intel.com> Signed-off-by: bavery <brian.avery@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
ac339ece20
commit
843f7ae410
|
@ -288,7 +288,14 @@ python toaster_buildhistory_dump() {
|
|||
images[target][dependsname] = {'size': 0, 'depends' : []}
|
||||
images[target][pname]['depends'].append((dependsname, deptype))
|
||||
|
||||
with open("%s/files-in-image.txt" % installed_img_path, "r") as fin:
|
||||
# files-in-image.txt is only generated if an image file is created,
|
||||
# so the file entries ('syms', 'dirs', 'files') for a target will be
|
||||
# empty for rootfs builds and other "image" tasks which don't
|
||||
# produce image files
|
||||
# (e.g. "bitbake core-image-minimal -c populate_sdk")
|
||||
files_in_image_path = "%s/files-in-image.txt" % installed_img_path
|
||||
if os.path.exists(files_in_image_path):
|
||||
with open(files_in_image_path, "r") as fin:
|
||||
for line in fin:
|
||||
lc = [ x for x in line.strip().split(" ") if len(x) > 0 ]
|
||||
if lc[0].startswith("l"):
|
||||
|
|
Loading…
Reference in New Issue