[oe-commits] [openembedded-core] 07/40: image_types: use initrd from pre-sstate directory

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 13d675b0f8968bcfdf36035fd959be285e3da378
Author: Ed Bartosh <ed.bartosh at linux.intel.com>
AuthorDate: Mon Jul 17 11:35:00 2017 +0300

    image_types: use initrd from pre-sstate directory
    
    mkelfImage was failing trying to use initrd from ${DEPLOY_DIR_IMAGE}:
    DEBUG: Python function extend_recipe_sysroot finished
    | DEBUG: Executing shell function do_image_elf
    | Cannot open `tmp/deploy/images/qemux86/core-image-minimal-qemux86.cpio.gz':
    No such file or directory
    
    As the images have only one deploy point it's not possible to reference
    something the images themselves are deploying. They need to reference it
    in the "pre-sstate" directory ${IMGDEPLOYDIR}, not the post sstate one
    ${DEPLOY_DIR_IMAGE}.
    
    Fixed by using ${IMGDEPLOYDIR} instead of ${DEPLOY_DIR_IMAGE} in
    mkelfImage command line.
    
    [YOCTO #11767]
    
    Signed-off-by: Ed Bartosh <ed.bartosh at linux.intel.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/classes/image_types.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 8f8d79c..a0a516e 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -146,7 +146,7 @@ ELF_APPEND ?= "ramdisk_size=32768 root=/dev/ram0 rw console="
 
 IMAGE_CMD_elf () {
 	test -f ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.elf && rm -f ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.elf
-	mkelfImage --kernel=${ELF_KERNEL} --initrd=${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.cpio.gz --output=${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.elf --append='${ELF_APPEND}' ${EXTRA_IMAGECMD}
+	mkelfImage --kernel=${ELF_KERNEL} --initrd=${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.cpio.gz --output=${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.elf --append='${ELF_APPEND}' ${EXTRA_IMAGECMD}
 }
 
 IMAGE_TYPEDEP_elf = "cpio.gz"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.