diff options
Diffstat (limited to 'meta/classes/image_types.bbclass')
-rw-r--r-- | meta/classes/image_types.bbclass | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index 9d66d7da7a..8f048497a1 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass | |||
@@ -17,20 +17,20 @@ def imagetypes_getdepends(d): | |||
17 | d += ":do_populate_sysroot" | 17 | d += ":do_populate_sysroot" |
18 | deps.add(d) | 18 | deps.add(d) |
19 | 19 | ||
20 | fstypes = set((d.getVar('IMAGE_FSTYPES', True) or "").split()) | 20 | fstypes = set((d.getVar('IMAGE_FSTYPES') or "").split()) |
21 | fstypes |= set((d.getVar('IMAGE_FSTYPES_DEBUGFS', True) or "").split()) | 21 | fstypes |= set((d.getVar('IMAGE_FSTYPES_DEBUGFS') or "").split()) |
22 | 22 | ||
23 | deps = set() | 23 | deps = set() |
24 | for typestring in fstypes: | 24 | for typestring in fstypes: |
25 | types = typestring.split(".") | 25 | types = typestring.split(".") |
26 | basetype, resttypes = types[0], types[1:] | 26 | basetype, resttypes = types[0], types[1:] |
27 | 27 | ||
28 | adddep(d.getVar('IMAGE_DEPENDS_%s' % basetype, True) , deps) | 28 | adddep(d.getVar('IMAGE_DEPENDS_%s' % basetype) , deps) |
29 | for typedepends in (d.getVar("IMAGE_TYPEDEP_%s" % basetype, True) or "").split(): | 29 | for typedepends in (d.getVar("IMAGE_TYPEDEP_%s" % basetype) or "").split(): |
30 | adddep(d.getVar('IMAGE_DEPENDS_%s' % typedepends, True) , deps) | 30 | adddep(d.getVar('IMAGE_DEPENDS_%s' % typedepends) , deps) |
31 | for ctype in resttypes: | 31 | for ctype in resttypes: |
32 | adddep(d.getVar("CONVERSION_DEPENDS_%s" % ctype, True), deps) | 32 | adddep(d.getVar("CONVERSION_DEPENDS_%s" % ctype), deps) |
33 | adddep(d.getVar("COMPRESS_DEPENDS_%s" % ctype, True), deps) | 33 | adddep(d.getVar("COMPRESS_DEPENDS_%s" % ctype), deps) |
34 | 34 | ||
35 | # Sort the set so that ordering is consistant | 35 | # Sort the set so that ordering is consistant |
36 | return " ".join(sorted(deps)) | 36 | return " ".join(sorted(deps)) |
@@ -220,7 +220,7 @@ WKS_FILE_CHECKSUM = "${@'${WKS_FULL_PATH}:%s' % os.path.exists('${WKS_FULL_PATH} | |||
220 | do_image_wic[file-checksums] += "${WKS_FILE_CHECKSUM}" | 220 | do_image_wic[file-checksums] += "${WKS_FILE_CHECKSUM}" |
221 | 221 | ||
222 | python () { | 222 | python () { |
223 | if d.getVar('USING_WIC', True) and 'do_bootimg' in d: | 223 | if d.getVar('USING_WIC') and 'do_bootimg' in d: |
224 | bb.build.addtask('do_image_wic', '', 'do_bootimg', d) | 224 | bb.build.addtask('do_image_wic', '', 'do_bootimg', d) |
225 | } | 225 | } |
226 | 226 | ||
@@ -228,7 +228,7 @@ python do_write_wks_template () { | |||
228 | """Write out expanded template contents to WKS_FULL_PATH.""" | 228 | """Write out expanded template contents to WKS_FULL_PATH.""" |
229 | import re | 229 | import re |
230 | 230 | ||
231 | template_body = d.getVar('_WKS_TEMPLATE', True) | 231 | template_body = d.getVar('_WKS_TEMPLATE') |
232 | 232 | ||
233 | # Remove any remnant variable references left behind by the expansion | 233 | # Remove any remnant variable references left behind by the expansion |
234 | # due to undefined variables | 234 | # due to undefined variables |
@@ -240,18 +240,18 @@ python do_write_wks_template () { | |||
240 | else: | 240 | else: |
241 | template_body = new_body | 241 | template_body = new_body |
242 | 242 | ||
243 | wks_file = d.getVar('WKS_FULL_PATH', True) | 243 | wks_file = d.getVar('WKS_FULL_PATH') |
244 | with open(wks_file, 'w') as f: | 244 | with open(wks_file, 'w') as f: |
245 | f.write(template_body) | 245 | f.write(template_body) |
246 | } | 246 | } |
247 | 247 | ||
248 | python () { | 248 | python () { |
249 | if d.getVar('USING_WIC', True): | 249 | if d.getVar('USING_WIC'): |
250 | wks_file_u = d.getVar('WKS_FULL_PATH', False) | 250 | wks_file_u = d.getVar('WKS_FULL_PATH', False) |
251 | wks_file = d.expand(wks_file_u) | 251 | wks_file = d.expand(wks_file_u) |
252 | base, ext = os.path.splitext(wks_file) | 252 | base, ext = os.path.splitext(wks_file) |
253 | if ext == '.in' and os.path.exists(wks_file): | 253 | if ext == '.in' and os.path.exists(wks_file): |
254 | wks_out_file = os.path.join(d.getVar('WORKDIR', True), os.path.basename(base)) | 254 | wks_out_file = os.path.join(d.getVar('WORKDIR'), os.path.basename(base)) |
255 | d.setVar('WKS_FULL_PATH', wks_out_file) | 255 | d.setVar('WKS_FULL_PATH', wks_out_file) |
256 | d.setVar('WKS_TEMPLATE_PATH', wks_file_u) | 256 | d.setVar('WKS_TEMPLATE_PATH', wks_file_u) |
257 | d.setVar('WKS_FILE_CHECKSUM', '${WKS_TEMPLATE_PATH}:True') | 257 | d.setVar('WKS_FILE_CHECKSUM', '${WKS_TEMPLATE_PATH}:True') |