diff options
| author | Rod Whitby <rod@whitby.id.au> | 2007-09-07 21:28:01 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2007-09-07 21:28:01 +0000 |
| commit | e99ec8115d43084aab8db32a7c6e0b362e648f82 (patch) | |
| tree | b1cc3de423b8fc6296e4bdd78e6bfd734d4da5bb /packages/linux | |
| parent | 6df7b6c8ef449b4d70ff6fce2871ba1bc48ad248 (diff) | |
| parent | 25eeb065fb156d376960420f1ea7879f3a2880ee (diff) | |
merge of '76f17964c43f7ddee34e65c3b91d78a68aecd213'
and '965f72e4cde00c3f4d4826ce609b171e77b92e00'
Diffstat (limited to 'packages/linux')
| -rw-r--r-- | packages/linux/linux.inc | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc index 8a3a36a66b..05bfc2f472 100644 --- a/packages/linux/linux.inc +++ b/packages/linux/linux.inc @@ -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 |