diff options
author | Andreas Müller <schnitzeltony@googlemail.com> | 2016-09-13 02:19:06 +0200 |
---|---|---|
committer | Andrei Gherzan <andrei@gherzan.ro> | 2016-09-21 17:34:17 +0100 |
commit | 4817e2c087097c02755d6309304878e42cf61d3c (patch) | |
tree | 04de80285ccf87b5f63bdc9b462798ace9a8ed07 | |
parent | ac6f357271a52010cca7e8f9b4fadd05a74916bc (diff) | |
download | meta-raspberrypi-4817e2c087097c02755d6309304878e42cf61d3c.tar.gz |
sdcard_image-rpi.bbclass: avoid corrupted images with latest oe-core
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@googlemail.com>
-rw-r--r-- | classes/sdcard_image-rpi.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/classes/sdcard_image-rpi.bbclass b/classes/sdcard_image-rpi.bbclass index 7ab0ca6..2f0daee 100644 --- a/classes/sdcard_image-rpi.bbclass +++ b/classes/sdcard_image-rpi.bbclass | |||
@@ -47,7 +47,7 @@ IMAGE_ROOTFS_ALIGNMENT = "4096" | |||
47 | 47 | ||
48 | # Use an uncompressed ext3 by default as rootfs | 48 | # Use an uncompressed ext3 by default as rootfs |
49 | SDIMG_ROOTFS_TYPE ?= "ext3" | 49 | SDIMG_ROOTFS_TYPE ?= "ext3" |
50 | SDIMG_ROOTFS = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.${SDIMG_ROOTFS_TYPE}" | 50 | SDIMG_ROOTFS = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.${SDIMG_ROOTFS_TYPE}" |
51 | 51 | ||
52 | IMAGE_DEPENDS_rpi-sdimg = " \ | 52 | IMAGE_DEPENDS_rpi-sdimg = " \ |
53 | parted-native \ | 53 | parted-native \ |
@@ -59,7 +59,7 @@ IMAGE_DEPENDS_rpi-sdimg = " \ | |||
59 | " | 59 | " |
60 | 60 | ||
61 | # SD card image name | 61 | # SD card image name |
62 | SDIMG = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.rpi-sdimg" | 62 | SDIMG = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.rpi-sdimg" |
63 | 63 | ||
64 | # Compression method to apply to SDIMG after it has been created. Supported | 64 | # Compression method to apply to SDIMG after it has been created. Supported |
65 | # compression formats are "gzip", "bzip2" or "xz". The original .rpi-sdimg file | 65 | # compression formats are "gzip", "bzip2" or "xz". The original .rpi-sdimg file |