diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2008-02-17 18:22:31 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-02-17 18:22:31 +0000 |
| commit | 2bd1b434ce09511ecc5ffe6b872162251ee1eab8 (patch) | |
| tree | d90ba00133e0860e009660eca6c5d4bcda6868e0 /classes/kernel.bbclass | |
| parent | 55f1bbed28e78a1f327b5ac198a0e54d02263890 (diff) | |
| parent | 673d1bb689817bb46661662b5d1459d587f038ab (diff) | |
merge of 'cb01f2744d89a35b7112e49fc0d5862aba66733f'
and 'd0092933b0c82a6d8470e8da03507e0e5e71529c'
Diffstat (limited to 'classes/kernel.bbclass')
| -rw-r--r-- | classes/kernel.bbclass | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 28e04ea204..6c12004dad 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -65,21 +65,21 @@ kernel_do_compile() { fi } +INITRAMFS_SYMLINK_NAME ?= "initramfs-${MACHINE}" +INITRAMFS_IMAGE_TARGET ?= "initramfs-image" + do_builtin_initramfs() { unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE - cp "${INITRAMFS_LOC}" usr/initramfs_data.cpio.gz + cp "${DEPLOY_DIR_IMAME}/${INITRAMFS_SYMLINK_NAME}" usr/initramfs_data.cpio.gz oe_runmake ${KERNEL_IMAGETYPE} CC="${KERNEL_CC}" LD="${KERNEL_LD}" install -d ${DEPLOY_DIR_IMAGE} - mv ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.no-initramfs.bin - install -m 0644 ${KERNEL_OUTPUT} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin + install -m 0644 ${KERNEL_OUTPUT} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}-initramfs.bin # Make sure to kill injected initramfs, in case someone will do "-c compile -f" rm usr/initramfs_data.cpio.gz - - [ -n "${DEPLOY_TO}" ] && install -m 0644 ${KERNEL_OUTPUT} ${DEPLOY_TO} } addtask builtin_initramfs after do_compile -# As it accepts external parameter(s), better make it unstamped do_builtin_initramfs[nostamp] = "1" +do_builtin_initramfs[depends] = "${INITRAMFS_IMAGE_TARGET}:do_rootfs" kernel_do_stage() { ASMDIR=`readlink include/asm` |