diff options
Diffstat (limited to 'meta/classes/image-live.bbclass')
-rw-r--r-- | meta/classes/image-live.bbclass | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass index 966277c678..942298a7ce 100644 --- a/meta/classes/image-live.bbclass +++ b/meta/classes/image-live.bbclass | |||
@@ -19,8 +19,6 @@ | |||
19 | 19 | ||
20 | # External variables (also used by syslinux.bbclass) | 20 | # External variables (also used by syslinux.bbclass) |
21 | # ${INITRD} - indicates a list of filesystem images to concatenate and use as an initrd (optional) | 21 | # ${INITRD} - indicates a list of filesystem images to concatenate and use as an initrd (optional) |
22 | # ${NOISO} - skip building the ISO image if set to 1 | ||
23 | # ${NOHDD} - skip building the HDD image if set to 1 | ||
24 | # ${HDDIMG_ID} - FAT image volume-id | 22 | # ${HDDIMG_ID} - FAT image volume-id |
25 | # ${ROOTFS} - indicates a filesystem image to include as the root filesystem (optional) | 23 | # ${ROOTFS} - indicates a filesystem image to include as the root filesystem (optional) |
26 | 24 | ||
@@ -80,8 +78,8 @@ populate_live() { | |||
80 | } | 78 | } |
81 | 79 | ||
82 | build_iso() { | 80 | build_iso() { |
83 | # Only create an ISO if we have an INITRD and NOISO was not set | 81 | # Only create an ISO if we have an INITRD and the live or iso image type was selected |
84 | if [ -z "${INITRD}" ] || [ "${NOISO}" = "1" ]; then | 82 | if [ -z "${INITRD}" ] || [ "${@bb.utils.contains_any('IMAGE_FSTYPES', 'live iso', '1', '0', d)}" != "1" ]; then |
85 | bbnote "ISO image will not be created." | 83 | bbnote "ISO image will not be created." |
86 | return | 84 | return |
87 | fi | 85 | fi |
@@ -217,7 +215,7 @@ build_fat_img() { | |||
217 | 215 | ||
218 | build_hddimg() { | 216 | build_hddimg() { |
219 | # Create an HDD image | 217 | # Create an HDD image |
220 | if [ "${NOHDD}" != "1" ] ; then | 218 | if [ "${@bb.utils.contains_any('IMAGE_FSTYPES', 'live hddimg', '1', '0', d)}" = "1" ] ; then |
221 | populate_live ${HDDDIR} | 219 | populate_live ${HDDDIR} |
222 | 220 | ||
223 | if [ "${PCBIOS}" = "1" ]; then | 221 | if [ "${PCBIOS}" = "1" ]; then |