[OE-core] [PATCH] classes/image-empty: remove
Paul Eggleton
paul.eggleton at linux.intel.com
Wed Nov 13 19:05:58 UTC 2013
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 at linux.intel.com>
---
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
diff --git a/meta/classes/image-empty.bbclass b/meta/classes/image-empty.bbclass
deleted file mode 100644
index e69de29..0000000
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 422a826..bc60f0d 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)
--
1.8.1.2
More information about the Openembedded-core
mailing list