[yocto] [meta-raspberrypi][PATCH 2/2] sdcard_image-rpi.bbclass: avoid corrupted images with latest oe-core

[Khem Raj]

> On Sep 13, 2016, at 1:05 AM, Andreas Müller <schnitzeltony at googlemail.com> wrote:
> 
> On Tue, Sep 13, 2016 at 2:19 AM, Andreas Müller
> <schnitzeltony at googlemail.com> wrote:
>> oe-core's commit d54339d4b1a7e884de636f6325ca60409ebd95ff creates image in
>> IMGDEPLOYDIR and copies through sstate to DEPLOY_DIR_IMAGE. That causes
>> DEPLOY_DIR_IMAGE not valid when calling IMAGE_CMD. Therefore use
>> IMGDEPLOYDIR for sdcard creation too.
>> 
>> Signed-off-by: Andreas Müller <schnitzeltony at googlemail.com>
>> ---
>> classes/sdcard_image-rpi.bbclass | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>> 
>> diff --git a/classes/sdcard_image-rpi.bbclass b/classes/sdcard_image-rpi.bbclass
>> index f506858..1acf9d8 100644
>> --- a/classes/sdcard_image-rpi.bbclass
>> +++ b/classes/sdcard_image-rpi.bbclass
>> @@ -47,7 +47,7 @@ IMAGE_ROOTFS_ALIGNMENT = "4096"
>> 
>> # Use an uncompressed ext3 by default as rootfs
>> SDIMG_ROOTFS_TYPE ?= "ext3"
>> -SDIMG_ROOTFS = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.${SDIMG_ROOTFS_TYPE}"
>> +SDIMG_ROOTFS = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.${SDIMG_ROOTFS_TYPE}"
>> 
>> IMAGE_DEPENDS_rpi-sdimg = " \
>>                        parted-native \
>> @@ -59,7 +59,7 @@ IMAGE_DEPENDS_rpi-sdimg = " \
>>                        "
>> 
>> # SD card image name
>> -SDIMG = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.rpi-sdimg"
>> +SDIMG = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.rpi-sdimg"
>> 
>> # Compression method to apply to SDIMG after it has been created. Supported
>> # compression formats are "gzip", "bzip2" or "xz". The original .rpi-sdimg file
>> --
>> 2.5.5
>> 
> Forgot to mention: Handy links on sdcard images are properly created
> with this patch.

Staged into kraj/master

> 
> Andreas
> --
> _______________________________________________
> yocto mailing list
> yocto at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 204 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <http://lists.yoctoproject.org/pipermail/yocto/attachments/20160913/fe775ed1/attachment.pgp>