Skip to content

Commit

Permalink
sdcard_image-rpi.bbclass: avoid corrupted images with latest oe-core
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
schnitzeltony authored and agherzan committed Sep 21, 2016
1 parent ac6f357 commit 4817e2c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions classes/sdcard_image-rpi.bbclass
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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
Expand Down

0 comments on commit 4817e2c

Please sign in to comment.