diff options
author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2014-02-18 15:49:43 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-20 14:28:10 +0000 |
commit | f866b2e4b78c91f6c10f1da723505c0c9d99e856 (patch) | |
tree | dc8b62e1475c81ed2dcf93d2fdd43053184ffa2f /meta/classes/image_types.bbclass | |
parent | 66648268ab5803439aa282dd67982d520c491d56 (diff) | |
download | poky-f866b2e4b78c91f6c10f1da723505c0c9d99e856.tar.gz |
image*.bbclass, bootimg.bbclass: add image type dependencies
The following dependencies were manually added in the image creation
code. However, in order to have an image dependency mechanism in place,
use a new variable, IMAGE_TYPEDEP, to declare that an image type depends
on another being already created.
The following dependencies are added by this commit:
elf -> cpio.gz
live -> ext3
vmdk -> ext3
iso -> ext3
hddimg -> ext3
This commit adds also another new variable: IMAGE_TYPES_MASKED. Currently,
masking out certain types from IMAGE_FSTYPES was hardcoded in the image
creation code.
[YOCTO #5830]
(From OE-Core rev: 5e2796aa28e02ae3a076c6593c6533753720b13d)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/image_types.bbclass')
-rw-r--r-- | meta/classes/image_types.bbclass | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index 89749430bc..9577b1f2ec 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass | |||
@@ -80,6 +80,7 @@ IMAGE_CMD_elf () { | |||
80 | test -f ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.elf && rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.elf | 80 | test -f ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.elf && rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.elf |
81 | mkelfImage --kernel=${ELF_KERNEL} --initrd=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.gz --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.elf --append='${ELF_APPEND}' ${EXTRA_IMAGECMD} | 81 | mkelfImage --kernel=${ELF_KERNEL} --initrd=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.gz --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.elf --append='${ELF_APPEND}' ${EXTRA_IMAGECMD} |
82 | } | 82 | } |
83 | IMAGE_TYPEDEP_elf = "cpio.gz" | ||
83 | 84 | ||
84 | UBI_VOLNAME ?= "${MACHINE}-rootfs" | 85 | UBI_VOLNAME ?= "${MACHINE}-rootfs" |
85 | 86 | ||
@@ -146,3 +147,7 @@ DEPLOYABLE_IMAGE_TYPES ?= "hddimg iso" | |||
146 | 147 | ||
147 | # Use IMAGE_EXTENSION_xxx to map image type 'xxx' with real image file extension name(s) for Hob | 148 | # Use IMAGE_EXTENSION_xxx to map image type 'xxx' with real image file extension name(s) for Hob |
148 | IMAGE_EXTENSION_live = "hddimg iso" | 149 | IMAGE_EXTENSION_live = "hddimg iso" |
150 | |||
151 | # The IMAGE_TYPES_MASKED variable will be used to mask out from the IMAGE_FSTYPES, | ||
152 | # images that will not be built at do_rootfs time: vmdk, hddimg, iso, etc. | ||
153 | IMAGE_TYPES_MASKED ?= "" | ||