diff options
| author |   Robert Yang <liezhi.yang@windriver.com> | 2016-03-30 00:23:11 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-31 13:22:55 +0100 |
| commit | 4a70cc59a0350f06d4cc48c12c3053a39191ba07 (patch) | |
| tree | 5512696c8906a389ab38b4e275ae1f3bd29d6fc8 /meta/classes/image.bbclass | |
| parent | bfd4d95210b3f841aa2e7c5a06ac89667523438d (diff) | |
| download | openembedded-core-contrib-4a70cc59a0350f06d4cc48c12c3053a39191ba07.tar.gz | |
image-live.bbclass/image-vm.bbclass: remove duplicated code
Move the common code to live_vm_common.bbclass and remove duplicated ones.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/image.bbclass')
| -rw-r--r-- | meta/classes/image.bbclass | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 894ff993cc..d9c16106c2 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -544,15 +544,3 @@ do_bundle_initramfs () { } addtask bundle_initramfs after do_image_complete -# Some of the vars for vm and live image are conflicted, this function -# is used for fixing the problem. -def set_live_vm_vars(d, suffix): - vars = ['GRUB_CFG', 'SYSLINUX_CFG', 'ROOT', 'LABELS', 'INITRD'] - for var in vars: - var_with_suffix = var + '_' + suffix - if d.getVar(var, True): - bb.warn('Found potential conflicted var %s, please use %s rather than %s' % \ - (var, var_with_suffix, var)) - elif d.getVar(var_with_suffix, True): - d.setVar(var, d.getVar(var_with_suffix, True)) - |