summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-partition.py17
1 files changed, 13 insertions, 4 deletions
diff --git a/scripts/lib/wic/plugins/source/bootimg-partition.py b/scripts/lib/wic/plugins/source/bootimg-partition.py
index ca074a39d8..67e5498d5e 100644
--- a/scripts/lib/wic/plugins/source/bootimg-partition.py
+++ b/scripts/lib/wic/plugins/source/bootimg-partition.py
@@ -54,7 +54,7 @@ class BootimgPartitionPlugin(SourcePlugin):
54 - sets up a vfat partition 54 - sets up a vfat partition
55 - copies all files listed in IMAGE_BOOT_FILES variable 55 - copies all files listed in IMAGE_BOOT_FILES variable
56 """ 56 """
57 hdddir = "%s/boot" % cr_workdir 57 hdddir = "%s/boot.%d" % (cr_workdir, part.lineno)
58 install_cmd = "install -d %s" % hdddir 58 install_cmd = "install -d %s" % hdddir
59 exec_cmd(install_cmd) 59 exec_cmd(install_cmd)
60 60
@@ -65,10 +65,19 @@ class BootimgPartitionPlugin(SourcePlugin):
65 65
66 logger.debug('Kernel dir: %s', bootimg_dir) 66 logger.debug('Kernel dir: %s', bootimg_dir)
67 67
68 boot_files = get_bitbake_var("IMAGE_BOOT_FILES") 68 boot_files = None
69 for (fmt, id) in (("_uuid-%s", part.uuid), ("_label-%s", part.label), (None, None)):
70 if fmt:
71 var = fmt % id
72 else:
73 var = ""
74
75 boot_files = get_bitbake_var("IMAGE_BOOT_FILES" + var)
76 if boot_files is not None:
77 break
69 78
70 if not boot_files: 79 if boot_files is None:
71 raise WicError('No boot files defined, IMAGE_BOOT_FILES unset') 80 raise WicError('No boot files defined, IMAGE_BOOT_FILES unset for entry #%d' % part.lineno)
72 81
73 logger.debug('Boot files: %s', boot_files) 82 logger.debug('Boot files: %s', boot_files)
74 83