diff options
Diffstat (limited to 'meta/classes/image.bbclass')
-rw-r--r-- | meta/classes/image.bbclass | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index cc8a23c526..13b77c9638 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass | |||
@@ -242,8 +242,6 @@ fakeroot python do_image () { | |||
242 | pre_process_cmds = d.getVar("IMAGE_PREPROCESS_COMMAND", True) | 242 | pre_process_cmds = d.getVar("IMAGE_PREPROCESS_COMMAND", True) |
243 | 243 | ||
244 | execute_pre_post_process(d, pre_process_cmds) | 244 | execute_pre_post_process(d, pre_process_cmds) |
245 | |||
246 | write_wic_env(d) | ||
247 | } | 245 | } |
248 | do_image[dirs] = "${TOPDIR}" | 246 | do_image[dirs] = "${TOPDIR}" |
249 | do_image[umask] = "022" | 247 | do_image[umask] = "022" |
@@ -264,7 +262,7 @@ addtask do_image_complete after do_image before do_build | |||
264 | # Write environment variables used by wic | 262 | # Write environment variables used by wic |
265 | # to tmp/sysroots/<machine>/imgdata/<image>.env | 263 | # to tmp/sysroots/<machine>/imgdata/<image>.env |
266 | # | 264 | # |
267 | def write_wic_env(d): | 265 | python do_rootfs_wicenv () { |
268 | wicvars = d.getVar('WICVARS', True) | 266 | wicvars = d.getVar('WICVARS', True) |
269 | if not wicvars: | 267 | if not wicvars: |
270 | return | 268 | return |
@@ -278,6 +276,10 @@ def write_wic_env(d): | |||
278 | value = d.getVar(var, True) | 276 | value = d.getVar(var, True) |
279 | if value: | 277 | if value: |
280 | envf.write('%s="%s"\n' % (var, value.strip())) | 278 | envf.write('%s="%s"\n' % (var, value.strip())) |
279 | } | ||
280 | addtask do_rootfs_wicenv after do_rootfs before do_image_wic | ||
281 | do_rootfs_wicenv[vardeps] += "${WICVARS}" | ||
282 | do_rootfs_wicenv[prefuncs] = 'set_image_size' | ||
281 | 283 | ||
282 | def setup_debugfs_variables(d): | 284 | def setup_debugfs_variables(d): |
283 | d.appendVar('IMAGE_ROOTFS', '-dbg') | 285 | d.appendVar('IMAGE_ROOTFS', '-dbg') |