Incase we have overrides applied to IMAGE_FSTYPES we need to make sure
that we evaluate it fully before performing the live and vmdk logic
checks.
Signed-off-by: Tom Rini <tom.r...@gmail.com>
---
meta/classes/image.bbclass | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 79de5a2..ccfa1b1 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -78,10 +78,11 @@ do_rootfs[vardeps] += "BAD_RECOMMENDATIONS
NO_RECOMMENDATIONS"
do_build[depends] += "virtual/kernel:do_deploy"
+EVALED_IMAGE_FSTYPES := "${IMAGE_FSTYPES}"
def build_live(d):
- if base_contains("IMAGE_FSTYPES", "live", "live", "0", d) == "0": # live
is not set but hob might set iso or hddimg
- d.setVar('NOISO', base_contains('IMAGE_FSTYPES', "iso", "0", "1", d))
- d.setVar('NOHDD', base_contains('IMAGE_FSTYPES', "hddimg", "0", "1",
d))
+ if base_contains("EVALED_IMAGE_FSTYPES", "live", "live", "0", d) == "0": #
live is not set but hob might set iso or hddimg
+ d.setVar('NOISO', base_contains('EVALED_IMAGE_FSTYPES', "iso", "0",
"1", d))
+ d.setVar('NOHDD', base_contains('EVALED_IMAGE_FSTYPES', "hddimg", "0",
"1", d))
if d.getVar('NOISO', True) == "0" or d.getVar('NOHDD', True) == "0":
return "image-live"
return ""
@@ -90,7 +91,7 @@ def build_live(d):
IMAGE_TYPE_live = "${@build_live(d)}"
inherit ${IMAGE_TYPE_live}
-IMAGE_TYPE_vmdk = '${@base_contains("IMAGE_FSTYPES", "vmdk", "image-vmdk", "",
d)}'
+IMAGE_TYPE_vmdk = '${@base_contains("EVALED_IMAGE_FSTYPES", "vmdk",
"image-vmdk", "", d)}'
inherit ${IMAGE_TYPE_vmdk}
python () {
--
1.9.3
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
