classes/image-empty: remove
PATCH 1/1 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 <[email protected]>
--- meta/classes/image-empty.bbclass | 0 meta/classes/image.bbclass | 12 ++++++------ 2 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 meta/classes/image-empty.bbclass
meta/classes/image-empty.bbclass deleted +0 -0
meta/classes/image.bbclass +6 -6
@@ -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)
Signature · 1 line
1.8.1.2