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:39:47 +0000 |
| commit | bfc55b9fe4a05793802a32519807ea8a25e40d94 (patch) | |
| tree | 5f4975996c812c49b0f9ebca5ef7d47d04c6ac74 /meta/classes/image.bbclass | |
| parent | 931cf6e9a8296597a06ec406e162121b794de3bf (diff) | |
| download | poky-bfc55b9fe4a05793802a32519807ea8a25e40d94.tar.gz | |
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.
(From OE-Core rev: f312eb2d2a2715e772ed9e8afc7aea326d8079ec)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.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, 6 insertions, 6 deletions
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): | |||
| 95 | d.setVar('NOISO', base_contains('IMAGE_FSTYPES', "iso", "0", "1", d)) | 95 | d.setVar('NOISO', base_contains('IMAGE_FSTYPES', "iso", "0", "1", d)) |
| 96 | d.setVar('NOHDD', base_contains('IMAGE_FSTYPES', "hddimg", "0", "1", d)) | 96 | d.setVar('NOHDD', base_contains('IMAGE_FSTYPES', "hddimg", "0", "1", d)) |
| 97 | if d.getVar('NOISO', True) == "0" or d.getVar('NOHDD', True) == "0": | 97 | if d.getVar('NOISO', True) == "0" or d.getVar('NOHDD', True) == "0": |
| 98 | return "live" | 98 | return "image-live" |
| 99 | return "empty" | 99 | return "" |
| 100 | return "live" | 100 | return "image-live" |
| 101 | 101 | ||
| 102 | IMAGE_TYPE_live = "${@build_live(d)}" | 102 | IMAGE_TYPE_live = "${@build_live(d)}" |
| 103 | 103 | ||
| 104 | inherit image-${IMAGE_TYPE_live} | 104 | inherit ${IMAGE_TYPE_live} |
| 105 | IMAGE_TYPE_vmdk = '${@base_contains("IMAGE_FSTYPES", "vmdk", "vmdk", "empty", d)}' | 105 | IMAGE_TYPE_vmdk = '${@base_contains("IMAGE_FSTYPES", "vmdk", "image-vmdk", "", d)}' |
| 106 | inherit image-${IMAGE_TYPE_vmdk} | 106 | inherit ${IMAGE_TYPE_vmdk} |
| 107 | 107 | ||
| 108 | python () { | 108 | python () { |
| 109 | deps = " " + imagetypes_getdepends(d) | 109 | deps = " " + imagetypes_getdepends(d) |