[OE-core] [PATCH 3/5] kernel.bbclass: move uImage handling to separate task

[Dmitry Eremin-Solenikov]

On 09/18/2011 02:25 AM, Otavio Salvador wrote:
> This was nack'ed but I don't remember why; Richard?

This was nack'ed because that version of the patch didn't check
for existence of uImage built by kernel tree (not present in 
oe-dev/meta-oe, added in oe-core as somebody had problems with 
regenerated uImage). My version of the patch has such check, so it can 
go in probably.

>
> On Sat, Sep 17, 2011 at 19:18, Dmitry Eremin-Solenikov
> <dbaryshkov at gmail.com>  wrote:
>> As per org.oe.dev and meta-oe's kernel.bbclass move uImage creation to
>> separate task from do_deploy. The only major feature of oe-core's
>> version (not to recreate uImage if it exists) is retained in this patch.
>>
>> Signed-off-by: Dmitry Eremin-Solenikov<dbaryshkov at gmail.com>
>> ---
>>   meta/classes/kernel.bbclass |   40 ++++++++++++++++++++++++----------------
>>   1 files changed, 24 insertions(+), 16 deletions(-)
>>
>> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
>> index b44e3b5..6ff4018 100644
>> --- a/meta/classes/kernel.bbclass
>> +++ b/meta/classes/kernel.bbclass
>> @@ -486,6 +486,30 @@ do_sizecheck() {
>>
>>   addtask sizecheck before do_install after do_compile
>>
>> +do_uboot_mkimage() {
>> +    if test "x${KERNEL_IMAGETYPE}" = "xuImage" -a \
>> +            ! -e arch/${ARCH}/boot/uImage ; then
>> +        ENTRYPOINT=${UBOOT_ENTRYPOINT}
>> +        if test -n "${UBOOT_ENTRYSYMBOL}"; then
>> +            ENTRYPOINT=`${HOST_PREFIX}nm ${S}/vmlinux | \
>> +                   awk '$3=="${UBOOT_ENTRYSYMBOL}" {print $1}'`
>> +        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 ${UBOOT_ARCH} -O linux -T kernel -C none -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin arch/${ARCH}/boot/uImage
>> +            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 ${UBOOT_ARCH} -O linux -T kernel -C gzip -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz arch/${ARCH}/boot/uImage
>> +            rm -f linux.bin.gz
>> +        fi
>> +    fi
>> +}
>> +
>> +addtask uboot_mkimage before do_install after do_compile
>> +
>>   KERNEL_IMAGE_BASE_NAME ?= "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME}"
>>   # Don't include the DATETIME variable in the sstate package signatures
>>   KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
>> @@ -497,22 +521,6 @@ kernel_do_deploy() {
>>                 tar -cvzf ${DEPLOYDIR}/modules-${KERNEL_VERSION}-${PR}-${MACHINE}.tgz -C ${D} lib
>>         fi
>>
>> -       if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then
>> -               if test -e arch/${ARCH}/boot/uImage ; then
>> -                       cp arch/${ARCH}/boot/uImage ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
>> -               elif 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 ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.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 ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
>> -                       rm -f linux.bin.gz
>> -               fi
>> -       fi
>> -
>>         cd ${DEPLOYDIR}
>>         rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin
>>         ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGE_SYMLINK_NAME}.bin
>> --
>> 1.7.2.5
>>
>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core at lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>>
>
>
>