[oe-commits] org.oe.dev linux.inc: use kernel decompressor (fast!) instead of uboot one (sloooooooow), closes #2925

[koen commit]

linux.inc: use kernel decompressor (fast!) instead of uboot one (sloooooooow), closes #2925

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: efc0ab0488966ec8b240c345445e8a5fa688b30f
ViewMTN: http://monotone.openembedded.org/revision/info/efc0ab0488966ec8b240c345445e8a5fa688b30f
Files:
1
packages/linux/linux.inc
Diffs:

#
# mt diff -r93d42c42fbac9beca66c0c236f2fb48801155c94 -refc0ab0488966ec8b240c345445e8a5fa688b30f
#
# 
# 
# patch "packages/linux/linux.inc"
#  from [025c7f5129eca1ed32f2540c0b62c387c8d0cec5]
#    to [4f5f493a73db7cb33ae34f7b5501c9bb911df71f]
# 
============================================================
--- packages/linux/linux.inc	025c7f5129eca1ed32f2540c0b62c387c8d0cec5
+++ packages/linux/linux.inc	4f5f493a73db7cb33ae34f7b5501c9bb911df71f
@@ -71,16 +71,21 @@ do_deploy() {
         tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${PR}-${MACHINE}.tgz -C ${D} lib
         
         if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then 
-            ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin
-            rm -f linux.bin.gz
-            gzip -9 linux.bin
-            uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin
-            rm -f linux.bin.gz
-        fi
+            if test -e arch/${ARCH}/boot/compressed/vmlinux ; then
+                ${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin
+                uboot-mkimage -A ${ARCH} -O linux -T kernel -C none -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin
+                rm -f linux.bin
+	    else
+	        ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin
+                rm -f linux.bin.gz
+                gzip -9 linux.bin
+                uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin
+                rm -f linux.bin.gz
+            fi
+	fi
 }
 
 do_deploy[dirs] = "${S}"
 
-addtask prepatch before do_patch after do_unpack
 addtask deploy before do_package after do_install