diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2008-02-19 16:17:33 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-02-19 16:17:33 +0000 |
| commit | f55e1cd950a96045de381abedde9e2727d001234 (patch) | |
| tree | 31c642152a1e8456d85bfa1bea0bbdc0db39e674 /classes/kernel.bbclass | |
| parent | 18bae0d61ca9ad3cb8970bbeedef55ad328bb422 (diff) | |
| parent | d69d798924c7d9e543f7078e611ee8c410f2fad6 (diff) | |
merge of '4f1c373d43a7c1b912b21780d67df8ccec796116'
and 'd684223b6fbdf20a18d598446664827707b7dd91'
Diffstat (limited to 'classes/kernel.bbclass')
| -rw-r--r-- | classes/kernel.bbclass | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 28e04ea204..1e325323df 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` @@ -128,6 +128,10 @@ kernel_do_stage() { if [ -e arch/${ARCH}/Makefile ]; then install -d ${STAGING_KERNEL_DIR}/arch/${ARCH} install -m 0644 arch/${ARCH}/Makefile* ${STAGING_KERNEL_DIR}/arch/${ARCH} + # Otherwise check arch/x86/Makefile for i386 and x86_64 on kernels >= 2.6.24 + elif [ -e arch/x86/Makefile ]; then + install -d ${STAGING_KERNEL_DIR}/arch/x86 + install -m 0644 arch/x86/Makefile* ${STAGING_KERNEL_DIR}/arch/x86 fi cp -fR include/config* ${STAGING_KERNEL_DIR}/include/ install -m 0644 ${KERNEL_OUTPUT} ${STAGING_KERNEL_DIR}/${KERNEL_IMAGETYPE} |