[oe-commits] org.oe.dev kernel.bbclass: -change initramfs-logic

[thesing commit]

kernel.bbclass: -change initramfs-logic
		-add parameter to do_sizecheck do make it optional

Author: thesing at openembedded.org
Branch: org.openembedded.dev
Revision: ae83b5e08b8c7f470b2e9398f4fa137f24f55565
ViewMTN: http://monotone.openembedded.org/revision/info/ae83b5e08b8c7f470b2e9398f4fa137f24f55565
Files:
1
classes/kernel.bbclass
Diffs:

#
# mt diff -r0308024e7a88007651ed3a14db106a00b69b32a1 -rae83b5e08b8c7f470b2e9398f4fa137f24f55565
#
#
#
# patch "classes/kernel.bbclass"
#  from [7cbc09d4f4fd3e7051928da4ba4f8a6034393be9]
#    to [3ffe1672ca1e9239f5d1d1b3d0b8264888a6808b]
#
============================================================
--- classes/kernel.bbclass	7cbc09d4f4fd3e7051928da4ba4f8a6034393be9
+++ classes/kernel.bbclass	3ffe1672ca1e9239f5d1d1b3d0b8264888a6808b
@@ -73,6 +73,9 @@ kernel_do_compile() {
 UBOOT_LOADADDRESS ?= "${UBOOT_ENTRYPOINT}"
 
 kernel_do_compile() {
+	if [ ! -z "${INITRAMFS_IMAGE}" ]; then
+		cp "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.cpio.gz" initramfs.cpio.gz
+	fi
 	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
 	oe_runmake include/linux/version.h CC="${KERNEL_CC}" LD="${KERNEL_LD}"
 	if [ "${KERNEL_MAJOR_VERSION}" != "2.6" ]; then
@@ -85,30 +88,9 @@ kernel_do_compile() {
 		oenote "no modules to compile"
 	fi
 }
+kernel_do_compile[depends] = "${INITRAMFS_TASK}"
 
 
-do_builtin_initramfs() {
-	 if [ ! -z "${INITRAMFS_IMAGE}" ]; then
-		unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
-		cp "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.cpio.gz" usr/initramfs_data.cpio.gz
-		oe_runmake ${KERNEL_IMAGETYPE} CC="${KERNEL_CC}" LD="${KERNEL_LD}"
-	
-		install -d ${DEPLOY_DIR_IMAGE}
-		install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}-${INITRAMFS_IMAGE}.bin
-		package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}-${INITRAMFS_IMAGE}.bin
-	
-		# Make sure to kill injected initramfs, in case someone will do "-c compile -f"
-		rm usr/initramfs_data.cpio.gz
-		
-		cd ${DEPLOY_DIR_IMAGE}
-		rm -f ${KERNEL_IMAGE_SYMLINK_NAME}-${INITRAMFS_IMAGE}.bin
-		ln -sf ${KERNEL_IMAGE_BASE_NAME}-${INITRAMFS_IMAGE}.bin ${KERNEL_IMAGE_SYMLINK_NAME}-${INITRAMFS_IMAGE}.bin
-		package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_SYMLINK_NAME}-${INITRAMFS_IMAGE}.bin
-	fi
-}
-addtask builtin_initramfs before do_build after do_package_write
-do_builtin_initramfs[depends] = '${INITRAMFS_TASK}'
-
 kernel_do_stage() {
 	ASMDIR=`readlink include/asm`
 
@@ -468,7 +450,7 @@ do_sizecheck() {
 # Support checking the kernel size since some kernels need to reside in partitions
 # with a fixed length or there is a limit in transferring the kernel to memory
 do_sizecheck() {
-	if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" ]; then
+	if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" -a -z "${DONT_CHECK_KERNELSIZE}"]; then
         	size=`ls -l arch/${ARCH}/boot/${KERNEL_IMAGETYPE} | awk '{ print $5}'`
         	if [ $size -ge ${KERNEL_IMAGE_MAXSIZE} ]; then
                 	rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE}