diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-11-13 19:05:58 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-11-14 13:35:18 +0000 |
| commit | f312eb2d2a2715e772ed9e8afc7aea326d8079ec (patch) | |
| tree | 0ca8920a64baa3dc04c899e8e6485e01b815e8c4 | |
| parent | 7136cbc64e5efb09f3fae3e2e35a181ca3d66dd4 (diff) | |
| download | openembedded-core-f312eb2d2a2715e772ed9e8afc7aea326d8079ec.tar.gz openembedded-core-f312eb2d2a2715e772ed9e8afc7aea326d8079ec.tar.bz2 openembedded-core-f312eb2d2a2715e772ed9e8afc7aea326d8079ec.zip | |
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 <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/image-empty.bbclass | 0 | ||||
| -rw-r--r-- | meta/classes/image.bbclass | 12 |
2 files changed, 6 insertions, 6 deletions
diff --git a/meta/classes/image-empty.bbclass b/meta/classes/image-empty.bbclass deleted file mode 100644 index e69de29bb2..0000000000 --- a/meta/classes/image-empty.bbclass +++ /dev/null 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) |