From 4a70cc59a0350f06d4cc48c12c3053a39191ba07 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Wed, 30 Mar 2016 00:23:11 -0700 Subject: 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 Signed-off-by: Richard Purdie --- meta/classes/image.bbclass | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'meta/classes/image.bbclass') 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)) - -- cgit 1.2.3-korg