diff options
Diffstat (limited to 'meta/classes/image.bbclass')
-rw-r--r-- | meta/classes/image.bbclass | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index b1132b420e..f056ca5970 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass | |||
@@ -1,11 +1,3 @@ | |||
1 | def build_live(d): | ||
2 | if bb.utils.contains("IMAGE_FSTYPES", "live", "live", "0", d) == "0": # live is not set but hob might set iso or hddimg | ||
3 | d.setVar('NOISO', bb.utils.contains('IMAGE_FSTYPES', "iso", "0", "1", d)) | ||
4 | d.setVar('NOHDD', bb.utils.contains('IMAGE_FSTYPES', "hddimg", "0", "1", d)) | ||
5 | if d.getVar('NOISO') == "0" or d.getVar('NOHDD') == "0": | ||
6 | return "image-live" | ||
7 | return "" | ||
8 | return "image-live" | ||
9 | 1 | ||
10 | IMAGE_CLASSES ??= "" | 2 | IMAGE_CLASSES ??= "" |
11 | 3 | ||
@@ -18,7 +10,7 @@ IMGCLASSES = "rootfs_${IMAGE_PKGTYPE} image_types ${IMAGE_CLASSES}" | |||
18 | # Only Linux SDKs support populate_sdk_ext, fall back to populate_sdk_base | 10 | # Only Linux SDKs support populate_sdk_ext, fall back to populate_sdk_base |
19 | # in the non-Linux SDK_OS case, such as mingw32 | 11 | # in the non-Linux SDK_OS case, such as mingw32 |
20 | IMGCLASSES += "${@['populate_sdk_base', 'populate_sdk_ext']['linux' in d.getVar("SDK_OS")]}" | 12 | IMGCLASSES += "${@['populate_sdk_base', 'populate_sdk_ext']['linux' in d.getVar("SDK_OS")]}" |
21 | IMGCLASSES += "${@build_live(d)}" | 13 | IMGCLASSES += "${@bb.utils.contains_any('IMAGE_FSTYPES', 'live iso hddimg', 'image-live', '', d)}" |
22 | IMGCLASSES += "${@bb.utils.contains('IMAGE_FSTYPES', 'container', 'image-container', '', d)}" | 14 | IMGCLASSES += "${@bb.utils.contains('IMAGE_FSTYPES', 'container', 'image-container', '', d)}" |
23 | IMGCLASSES += "image_types_wic" | 15 | IMGCLASSES += "image_types_wic" |
24 | IMGCLASSES += "${@oe.utils.conditional('TEST_IMAGE', '1', 'testimage-auto', '', d)}" | 16 | IMGCLASSES += "${@oe.utils.conditional('TEST_IMAGE', '1', 'testimage-auto', '', d)}" |