diff options
| author | Andrei Gherzan <andrei@gherzan.ro> | 2012-07-10 10:49:15 +0300 |
|---|---|---|
| committer | Andrei Gherzan <andrei@gherzan.ro> | 2012-07-10 12:00:19 +0300 |
| commit | fb72cf86c268064f0a5a7a8cea5749de466c3dd4 (patch) | |
| tree | 4bf6e6fd0275d899653bb11fb241215446c4f727 | |
| parent | fc02bba13d65dd2447d0a6d1f3b63300510eb097 (diff) | |
| download | meta-raspberrypi-fb72cf86c268064f0a5a7a8cea5749de466c3dd4.tar.gz | |
sdcard_image-rpi: Use ${KERNEL_IMAGETYPE}-${MACHINE} as kernel source from deploy dir
${KERNEL_IMAGETYPE} symlink was introduced after denzil so we use
${KERNEL_IMAGETYPE}-${MACHINE} to be able to satisfy the existence in denzil and master
as well.
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
| -rw-r--r-- | classes/sdcard_image-rpi.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/classes/sdcard_image-rpi.bbclass b/classes/sdcard_image-rpi.bbclass index 6d08020..f4d777e 100644 --- a/classes/sdcard_image-rpi.bbclass +++ b/classes/sdcard_image-rpi.bbclass | |||
| @@ -77,7 +77,7 @@ IMAGE_CMD_rpi-sdimg () { | |||
| 77 | # of the rootfs | 77 | # of the rootfs |
| 78 | mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/bootcode.bin :: | 78 | mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/bootcode.bin :: |
| 79 | mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/loader.bin :: | 79 | mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/loader.bin :: |
| 80 | mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} ::kernel.img | 80 | mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin ::kernel.img |
| 81 | 81 | ||
| 82 | if [ -n ${FATPAYLOAD} ] ; then | 82 | if [ -n ${FATPAYLOAD} ] ; then |
| 83 | echo "Copying payload into VFAT" | 83 | echo "Copying payload into VFAT" |