summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2014-05-21 04:14:26 -0400
committerChen Qi <Qi.Chen@windriver.com>2014-06-16 18:35:58 +0800
commit4492b52274d0ac89938a17bd569aedff723e69bc (patch)
tree41dfa93b83e2171791a516106eca03b19620f123
parent2510b3cf5064a0ac283e4138aef31f63a4555f5a (diff)
downloadopenembedded-core-contrib-4492b52274d0ac89938a17bd569aedff723e69bc.tar.gz
openembedded-core-contrib-4492b52274d0ac89938a17bd569aedff723e69bc.tar.bz2
openembedded-core-contrib-4492b52274d0ac89938a17bd569aedff723e69bc.zip
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 <Qi.Chen@windriver.com>
-rw-r--r--meta/classes/bootimg.bbclass7
1 files changed, 6 insertions, 1 deletions
diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass
index 7678567600..b925265633 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