From f312eb2d2a2715e772ed9e8afc7aea326d8079ec Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Wed, 13 Nov 2013 19:05:58 +0000 Subject: classes/image-empty: remove We don't actually need this dummy class; "inherit" can be used with an expression that evaluates to nothing with current BitBake. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/classes/image.bbclass | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'meta/classes/image.bbclass') diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 422a8261bd..bc60f0d6c0 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -95,15 +95,15 @@ def build_live(d): d.setVar('NOISO', base_contains('IMAGE_FSTYPES', "iso", "0", "1", d)) d.setVar('NOHDD', base_contains('IMAGE_FSTYPES', "hddimg", "0", "1", d)) if d.getVar('NOISO', True) == "0" or d.getVar('NOHDD', True) == "0": - return "live" - return "empty" - return "live" + return "image-live" + return "" + return "image-live" IMAGE_TYPE_live = "${@build_live(d)}" -inherit image-${IMAGE_TYPE_live} -IMAGE_TYPE_vmdk = '${@base_contains("IMAGE_FSTYPES", "vmdk", "vmdk", "empty", d)}' -inherit image-${IMAGE_TYPE_vmdk} +inherit ${IMAGE_TYPE_live} +IMAGE_TYPE_vmdk = '${@base_contains("IMAGE_FSTYPES", "vmdk", "image-vmdk", "", d)}' +inherit ${IMAGE_TYPE_vmdk} python () { deps = " " + imagetypes_getdepends(d) -- cgit 1.2.3-korg