diff options
| author |   Ed Bartosh <ed.bartosh@linux.intel.com> | 2017-01-26 13:52:24 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-31 14:13:28 +0000 |
| commit | 786368568a9525212e69f5cbf6da236f0a6be013 (patch) | |
| tree | 7ce4cf6f9a05156bf5029283c710a1c436032c0a /meta/classes/image.bbclass | |
| parent | 9ed399b99e40ec9ec76df1fbdedfb8104a463acc (diff) | |
| download | openembedded-core-786368568a9525212e69f5cbf6da236f0a6be013.tar.gz | |
image-wic: move wic code to image-wic.bbclass
There is a lot of wic code in image.bbclass and image_types.bbclass
Having all code separated in one file should make it more readable
and easier to maintain.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Diffstat (limited to 'meta/classes/image.bbclass')
| -rw-r--r-- | meta/classes/image.bbclass | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index e20e447680..613cd92600 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -187,6 +187,8 @@ python () { IMAGE_CLASSES += "image_types" inherit ${IMAGE_CLASSES} +inherit image-wic + IMAGE_POSTPROCESS_COMMAND ?= "" # some default locales @@ -327,29 +329,6 @@ fakeroot python do_image_qa () { } addtask do_image_qa after do_image_complete before do_build -# -# Write environment variables used by wic -# to tmp/sysroots/<machine>/imgdata/<image>.env -# -python do_rootfs_wicenv () { - wicvars = d.getVar('WICVARS') - if not wicvars: - return - - stdir = d.getVar('STAGING_DIR') - outdir = os.path.join(stdir, d.getVar('MACHINE'), 'imgdata') - bb.utils.mkdirhier(outdir) - basename = d.getVar('IMAGE_BASENAME') - with open(os.path.join(outdir, basename) + '.env', 'w') as envf: - for var in wicvars.split(): - value = d.getVar(var) - if value: - envf.write('%s="%s"\n' % (var, value.strip())) -} -addtask do_rootfs_wicenv after do_image before do_image_wic -do_rootfs_wicenv[vardeps] += "${WICVARS}" -do_rootfs_wicenv[prefuncs] = 'set_image_size' - def setup_debugfs_variables(d): d.appendVar('IMAGE_ROOTFS', '-dbg') d.appendVar('IMAGE_LINK_NAME', '-dbg') |