diff options
Diffstat (limited to 'meta/classes/image.bbclass')
-rw-r--r-- | meta/classes/image.bbclass | 12 |
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 | |||
90 | do_rootfs[depends] += "virtual/update-alternatives-native:do_populate_sysroot update-rc.d-native:do_populate_sysroot" | 90 | do_rootfs[depends] += "virtual/update-alternatives-native:do_populate_sysroot update-rc.d-native:do_populate_sysroot" |
91 | do_rootfs[recrdeptask] += "do_packagedata" | 91 | do_rootfs[recrdeptask] += "do_packagedata" |
92 | 92 | ||
93 | IMAGE_TYPE_live = '${@base_contains("IMAGE_FSTYPES", "live", "live", "empty", d)}' | 93 | def build_live(d): |
94 | if base_contains("IMAGE_FSTYPES", "live", "live", "0", d) == "0": # live is not set but hob might set iso or hddimg | ||
95 | d.setVar('NOISO', base_contains('IMAGE_FSTYPES', "iso", "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": | ||
98 | return "live" | ||
99 | return "empty" | ||
100 | return "live" | ||
101 | |||
102 | IMAGE_TYPE_live = "${@build_live(d)}" | ||
103 | |||
94 | inherit image-${IMAGE_TYPE_live} | 104 | inherit image-${IMAGE_TYPE_live} |
95 | IMAGE_TYPE_vmdk = '${@base_contains("IMAGE_FSTYPES", "vmdk", "vmdk", "empty", d)}' | 105 | IMAGE_TYPE_vmdk = '${@base_contains("IMAGE_FSTYPES", "vmdk", "vmdk", "empty", d)}' |
96 | inherit image-${IMAGE_TYPE_vmdk} | 106 | inherit image-${IMAGE_TYPE_vmdk} |