summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrea Galbusera <gizero@gmail.com>2017-08-01 08:46:45 +0200
committerAndrei Gherzan <andrei@gherzan.com>2017-10-20 15:53:35 +0100
commit093286dae8ed5b3d0576090fb631ef0182659212 (patch)
tree679b2a52ac68903432720f6aaa1266d77a39b53f
parented3b254454494b36d4205818e369f59718704e60 (diff)
downloadmeta-raspberrypi-093286dae8ed5b3d0576090fb631ef0182659212.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.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/classes/sdcard_image-rpi.bbclass b/classes/sdcard_image-rpi.bbclass
index 56f96f5..56a854e 100644
--- a/classes/sdcard_image-rpi.bbclass
+++ b/classes/sdcard_image-rpi.bbclass
@@ -73,7 +73,7 @@ SDIMG = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.rpi-sdimg"
73FATPAYLOAD ?= "" 73FATPAYLOAD ?= ""
74 74
75# SD card vfat partition image name 75# SD card vfat partition image name
76SDIMG_VFAT = "${IMGDEPLOYDIR}/${IMAGE_NAME}.vfat" 76SDIMG_VFAT = "${IMAGE_NAME}.vfat"
77SDIMG_LINK_VFAT = "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.vfat" 77SDIMG_LINK_VFAT = "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.vfat"
78 78
79IMAGE_CMD_rpi-sdimg () { 79IMAGE_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 *)