summaryrefslogtreecommitdiff
path: root/meta/classes/image.bbclass
diff options
context:
space:
mode:
authorValentin Popa <valentin.popa@intel.com>2013-09-27 15:34:24 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-14 16:54:29 +0100
commitf05ae5f57d9d1bd839fae0e3f353d4e0e303a183 (patch)
tree729e4877cd153ece084844994b2a53d2579f3b29 /meta/classes/image.bbclass
parent5bcd65807aa634060f98928db6011856934dabe4 (diff)
downloadopenembedded-core-f05ae5f57d9d1bd839fae0e3f353d4e0e303a183.tar.gz
openembedded-core-f05ae5f57d9d1bd839fae0e3f353d4e0e303a183.tar.bz2
openembedded-core-f05ae5f57d9d1bd839fae0e3f353d4e0e303a183.zip
image types: split live into iso and hddimg
Changes to split live into iso and hddimg without adding a new image type class. This patch has only a visible effect on HOB and solves part 2 of #3197 [YOCTO #3197] Signed-off-by: Valentin Popa <valentin.popa@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/image.bbclass')
-rw-r--r--meta/classes/image.bbclass12
1 files changed, 11 insertions, 1 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 7650594f8c..422a8261bd 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -90,7 +90,17 @@ do_rootfs[depends] += "makedevs-native:do_populate_sysroot virtual/fakeroot-nati
do_rootfs[depends] += "virtual/update-alternatives-native:do_populate_sysroot update-rc.d-native:do_populate_sysroot"
do_rootfs[recrdeptask] += "do_packagedata"
-IMAGE_TYPE_live = '${@base_contains("IMAGE_FSTYPES", "live", "live", "empty", d)}'
+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 d.getVar('NOISO', True) == "0" or d.getVar('NOHDD', True) == "0":
+ return "live"
+ return "empty"
+ return "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}