summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2014-02-18 15:49:43 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-20 14:28:10 +0000
commitf866b2e4b78c91f6c10f1da723505c0c9d99e856 (patch)
treedc8b62e1475c81ed2dcf93d2fdd43053184ffa2f /meta/classes
parent66648268ab5803439aa282dd67982d520c491d56 (diff)
downloadpoky-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')
-rw-r--r--meta/classes/bootimg.bbclass4
-rw-r--r--meta/classes/image-live.bbclass3
-rw-r--r--meta/classes/image-vmdk.bbclass3
-rw-r--r--meta/classes/image_types.bbclass5
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() {
232 bb.build.exec_func('build_iso', d) 232 bb.build.exec_func('build_iso', d)
233} 233}
234 234
235IMAGE_TYPEDEP_iso = "ext3"
236IMAGE_TYPEDEP_hddimg = "ext3"
237IMAGE_TYPES_MASKED += "iso hddimg"
238
235addtask bootimg before do_build 239addtask 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"
13do_bootimg[depends] += "${PN}:do_rootfs" 13do_bootimg[depends] += "${PN}:do_rootfs"
14 14
15inherit bootimg 15inherit bootimg
16
17IMAGE_TYPEDEP_live = "ext3"
18IMAGE_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"
16#inherit image-live 16#inherit image-live
17inherit boot-directdisk 17inherit boot-directdisk
18 18
19IMAGE_TYPEDEP_vmdk = "ext3"
20IMAGE_TYPES_MASKED += "vmdk"
21
19create_vmdk_image () { 22create_vmdk_image () {
20 qemu-img convert -O vmdk ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hdddirect ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmdk 23 qemu-img convert -O vmdk ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hdddirect ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmdk
21 ln -sf ${IMAGE_NAME}.vmdk ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.vmdk 24 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 () {
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}
83IMAGE_TYPEDEP_elf = "cpio.gz"
83 84
84UBI_VOLNAME ?= "${MACHINE}-rootfs" 85UBI_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
148IMAGE_EXTENSION_live = "hddimg iso" 149IMAGE_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.
153IMAGE_TYPES_MASKED ?= ""