summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanek Filus <janek.filus@bytesatwork.ch>2017-03-10 07:31:11 +0100
committerKhem Raj <raj.khem@gmail.com>2017-03-11 17:38:06 -0800
commit6c8ca9ccf1748f6a40e4f30f5df49e2501259cb0 (patch)
treeace420384a96d7871b1bb14fc8b96a6c40be46c2
parente070005aa8251c81323b393d49fd87f92e74cae1 (diff)
downloadmeta-raspberrypi-6c8ca9ccf1748f6a40e4f30f5df49e2501259cb0.tar.gz
sdcard_image: fix sdcard image generation
Rely on shell environment when copying devicetree and devicetree overlays to target image. Signed-off-by: Janek Filus <janek.filus@bytesatwork.ch> Signed-off-by: Khem Raj <raj.khem@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 79ab53a..af3e807 100644
--- a/classes/sdcard_image-rpi.bbclass
+++ b/classes/sdcard_image-rpi.bbclass
@@ -107,7 +107,7 @@ IMAGE_CMD_rpi-sdimg () {
107 DT_ROOT="${@split_overlays(d, 1)}" 107 DT_ROOT="${@split_overlays(d, 1)}"
108 108
109 # Copy board device trees to root folder 109 # Copy board device trees to root folder
110 for DTB in ${DT_ROOT}; do 110 for DTB in $DT_ROOT; do
111 DTB_BASE_NAME=`basename ${DTB} .dtb` 111 DTB_BASE_NAME=`basename ${DTB} .dtb`
112 112
113 mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTB_BASE_NAME}.dtb ::${DTB_BASE_NAME}.dtb 113 mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTB_BASE_NAME}.dtb ::${DTB_BASE_NAME}.dtb
@@ -115,7 +115,7 @@ IMAGE_CMD_rpi-sdimg () {
115 115
116 # Copy device tree overlays to dedicated folder 116 # Copy device tree overlays to dedicated folder
117 mmd -i ${WORKDIR}/boot.img overlays 117 mmd -i ${WORKDIR}/boot.img overlays
118 for DTB in ${DT_OVERLAYS}; do 118 for DTB in $DT_OVERLAYS; do
119 DTB_EXT=${DTB##*.} 119 DTB_EXT=${DTB##*.}
120 DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"` 120 DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"`
121 121