From: Chen Qi Date: Wed, 21 May 2014 08:14:26 +0000 (-0400) Subject: bootimg.bbclass: take initramfs into consideration X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4492b52274d0ac89938a17bd569aedff723e69bc;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git bootimg.bbclass: take initramfs into consideration It's a reasonable assumption that if INITRAMFS_IMAGE is set, the user wants to do something with it. So the bootimg.bbclass should not just ignore the existence of INITRAMFS_IMAGE. This patch fixes the bootimg.bbclass to ship the initramfs image or the bundled kernel for later use. Signed-off-by: Chen Qi --- diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass index 76785676009..b9252656339 100644 --- a/meta/classes/bootimg.bbclass +++ b/meta/classes/bootimg.bbclass @@ -66,6 +66,11 @@ populate() { # Install bzImage, initrd, and rootfs.img in DEST for all loaders to use. install -m 0644 ${STAGING_KERNEL_DIR}/bzImage ${DEST}/vmlinuz + if [ -n "${INITRAMFS_IMAGE}" ] && [ "${INITRAMFS_IMAGE_BUNDLE}" = "1" ]; then + install -m 0644 ${STAGING_KERNEL_DIR}/bzImage-initramfs-${MACHINE}.bin ${DEST}/vmlinuz-initramfs + elif [ -n "${INITRAMFS_IMAGE}" ]; then + install -m 0644 ${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.cpio.gz ${DEST}/initrd.img + fi if [ -n "${INITRD}" ] && [ -s "${INITRD}" ]; then install -m 0644 ${INITRD} ${DEST}/initrd @@ -237,4 +242,4 @@ IMAGE_TYPEDEP_iso = "ext3" IMAGE_TYPEDEP_hddimg = "ext3" IMAGE_TYPES_MASKED += "iso hddimg" -addtask bootimg before do_build +addtask bootimg before do_build after do_bundle_initramfs