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:04 +0000 |
| commit | 5e2796aa28e02ae3a076c6593c6533753720b13d (patch) | |
| tree | 4cec13f58229ef7341a4dd79b43f70766bfa6c70 | |
| parent | 85e89da55f778ad3713460cb0df1435d82e94510 (diff) | |
| download | openembedded-core-5e2796aa28e02ae3a076c6593c6533753720b13d.tar.gz openembedded-core-5e2796aa28e02ae3a076c6593c6533753720b13d.tar.bz2 openembedded-core-5e2796aa28e02ae3a076c6593c6533753720b13d.zip | |
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]
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
| -rw-r--r-- | meta/classes/bootimg.bbclass | 4 | ||||
| -rw-r--r-- | meta/classes/image-live.bbclass | 3 | ||||
| -rw-r--r-- | meta/classes/image-vmdk.bbclass | 3 | ||||
| -rw-r--r-- | meta/classes/image_types.bbclass | 5 |
4 files changed, 15 insertions, 0 deletions
diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass index 395085d0ab..c370bd6a10 100644 --- a/meta/classes/bootimg.bbclass +++ b/meta/classes/bootimg.bbclass @@ -232,4 +232,8 @@ python do_bootimg() { bb.build.exec_func('build_iso', d) } +IMAGE_TYPEDEP_iso = "ext3" +IMAGE_TYPEDEP_hddimg = "ext3" +IMAGE_TYPES_MASKED += "iso hddimg" + addtask bootimg before do_build diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass index bfb59f808b..c7e6937fa9 100644 --- a/meta/classes/image-live.bbclass +++ b/meta/classes/image-live.bbclass @@ -13,3 +13,6 @@ do_bootimg[depends] += "${INITRD_IMAGE}:do_rootfs" do_bootimg[depends] += "${PN}:do_rootfs" inherit bootimg + +IMAGE_TYPEDEP_live = "ext3" +IMAGE_TYPES_MASKED += "live" diff --git a/meta/classes/image-vmdk.bbclass b/meta/classes/image-vmdk.bbclass index 6983e5c823..6a98f17b9d 100644 --- a/meta/classes/image-vmdk.bbclass +++ b/meta/classes/image-vmdk.bbclass @@ -16,6 +16,9 @@ ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3" #inherit image-live inherit boot-directdisk +IMAGE_TYPEDEP_vmdk = "ext3" +IMAGE_TYPES_MASKED += "vmdk" + create_vmdk_image () { qemu-img convert -O vmdk ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hdddirect ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmdk ln -sf ${IMAGE_NAME}.vmdk ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.vmdk 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 () { test -f ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.elf && rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.elf 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} } +IMAGE_TYPEDEP_elf = "cpio.gz" UBI_VOLNAME ?= "${MACHINE}-rootfs" @@ -146,3 +147,7 @@ DEPLOYABLE_IMAGE_TYPES ?= "hddimg iso" # Use IMAGE_EXTENSION_xxx to map image type 'xxx' with real image file extension name(s) for Hob IMAGE_EXTENSION_live = "hddimg iso" + +# The IMAGE_TYPES_MASKED variable will be used to mask out from the IMAGE_FSTYPES, +# images that will not be built at do_rootfs time: vmdk, hddimg, iso, etc. +IMAGE_TYPES_MASKED ?= "" |