diff options
author | Andrea Galbusera <gizero@gmail.com> | 2017-08-01 08:46:45 +0200 |
---|---|---|
committer | Andrei Gherzan <andrei@gherzan.com> | 2017-08-29 16:27:05 +0100 |
commit | f70b24b1f1a66159bba1879dcc6a7f37d26085fc (patch) | |
tree | 776bbb7f66691285e2e5bd1a9e47f178c09b33f4 | |
parent | 2aa08e4f977468cbd3811587ece44f7148ad7829 (diff) | |
download | meta-raspberrypi-f70b24b1f1a66159bba1879dcc6a7f37d26085fc.tar.gz |
sdcard_image-rpi: fix absolute path in vfat symlink
Fix bitbake complaining with:
ERROR: core-image-minimal-1.0-r0 do_image_complete: sstate found an absolute
path symlink [...].vfat pointing at [...].vfat. Please replace this with a
relative link.
This patch redefines SDIMG_VFAT as a file name instead of a full absolute path,
then fixing the symlink creation by pointing to a relative target. The cp
command that deploys the artifact is changed accordingly to include the
destination path.
Signed-off-by: Andrea Galbusera <gizero@gmail.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 1f75ef7..42753d6 100644 --- a/classes/sdcard_image-rpi.bbclass +++ b/classes/sdcard_image-rpi.bbclass | |||
@@ -73,7 +73,7 @@ SDIMG = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.rpi-sdimg" | |||
73 | FATPAYLOAD ?= "" | 73 | FATPAYLOAD ?= "" |
74 | 74 | ||
75 | # SD card vfat partition image name | 75 | # SD card vfat partition image name |
76 | SDIMG_VFAT = "${IMGDEPLOYDIR}/${IMAGE_NAME}.vfat" | 76 | SDIMG_VFAT = "${IMAGE_NAME}.vfat" |
77 | SDIMG_LINK_VFAT = "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.vfat" | 77 | SDIMG_LINK_VFAT = "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.vfat" |
78 | 78 | ||
79 | IMAGE_CMD_rpi-sdimg () { | 79 | IMAGE_CMD_rpi-sdimg () { |
@@ -152,7 +152,7 @@ IMAGE_CMD_rpi-sdimg () { | |||
152 | # Deploy vfat partition (for u-boot case only) | 152 | # Deploy vfat partition (for u-boot case only) |
153 | case "${KERNEL_IMAGETYPE}" in | 153 | case "${KERNEL_IMAGETYPE}" in |
154 | "uImage") | 154 | "uImage") |
155 | cp ${WORKDIR}/boot.img ${SDIMG_VFAT} | 155 | cp ${WORKDIR}/boot.img ${IMGDEPLOYDIR}/${SDIMG_VFAT} |
156 | ln -sf ${SDIMG_VFAT} ${SDIMG_LINK_VFAT} | 156 | ln -sf ${SDIMG_VFAT} ${SDIMG_LINK_VFAT} |
157 | ;; | 157 | ;; |
158 | *) | 158 | *) |