diff options
Diffstat (limited to 'classes/sdcard_image-rpi.bbclass')
-rw-r--r-- | classes/sdcard_image-rpi.bbclass | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/classes/sdcard_image-rpi.bbclass b/classes/sdcard_image-rpi.bbclass index 041abb4..dc625a3 100644 --- a/classes/sdcard_image-rpi.bbclass +++ b/classes/sdcard_image-rpi.bbclass | |||
@@ -113,51 +113,51 @@ IMAGE_CMD_rpi-sdimg () { | |||
113 | BOOT_BLOCKS=$(LC_ALL=C parted -s ${SDIMG} unit b print | awk '/ 1 / { print substr($4, 1, length($4 -1)) / 512 /2 }') | 113 | BOOT_BLOCKS=$(LC_ALL=C parted -s ${SDIMG} unit b print | awk '/ 1 / { print substr($4, 1, length($4 -1)) / 512 /2 }') |
114 | rm -f ${WORKDIR}/boot.img | 114 | rm -f ${WORKDIR}/boot.img |
115 | mkfs.vfat -F32 -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img $BOOT_BLOCKS | 115 | mkfs.vfat -F32 -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img $BOOT_BLOCKS |
116 | mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/* ::/ | 116 | mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/* ::/ || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/* into boot.img" |
117 | if [ "${@bb.utils.contains("MACHINE_FEATURES", "armstub", "1", "0", d)}" = "1" ]; then | 117 | if [ "${@bb.utils.contains("MACHINE_FEATURES", "armstub", "1", "0", d)}" = "1" ]; then |
118 | mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/armstubs/${ARMSTUB} ::/ | 118 | mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/armstubs/${ARMSTUB} ::/ || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/armstubs/${ARMSTUB} into boot.img" |
119 | fi | 119 | fi |
120 | if test -n "${DTS}"; then | 120 | if test -n "${DTS}"; then |
121 | # Copy board device trees to root folder | 121 | # Copy board device trees to root folder |
122 | for dtbf in ${@split_overlays(d, True)}; do | 122 | for dtbf in ${@split_overlays(d, True)}; do |
123 | dtb=`basename $dtbf` | 123 | dtb=`basename $dtbf` |
124 | mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/$dtb ::$dtb | 124 | mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/$dtb ::$dtb || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/$dtb into boot.img" |
125 | done | 125 | done |
126 | 126 | ||
127 | # Copy device tree overlays to dedicated folder | 127 | # Copy device tree overlays to dedicated folder |
128 | mmd -i ${WORKDIR}/boot.img overlays | 128 | mmd -i ${WORKDIR}/boot.img overlays |
129 | for dtbf in ${@split_overlays(d, False)}; do | 129 | for dtbf in ${@split_overlays(d, False)}; do |
130 | dtb=`basename $dtbf` | 130 | dtb=`basename $dtbf` |
131 | mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/$dtb ::overlays/$dtb | 131 | mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/$dtb ::overlays/$dtb || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/$dtb into boot.img" |
132 | done | 132 | done |
133 | fi | 133 | fi |
134 | if [ "${RPI_USE_U_BOOT}" = "1" ]; then | 134 | if [ "${RPI_USE_U_BOOT}" = "1" ]; then |
135 | mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/u-boot.bin ::${SDIMG_KERNELIMAGE} | 135 | mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/u-boot.bin ::${SDIMG_KERNELIMAGE} || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/u-boot.bin into boot.img" |
136 | mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/boot.scr ::boot.scr | 136 | mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/boot.scr ::boot.scr || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/boot.scr into boot.img" |
137 | if [ ! -z "${INITRAMFS_IMAGE}" -a "${INITRAMFS_IMAGE_BUNDLE}" = "1" ]; then | 137 | if [ ! -z "${INITRAMFS_IMAGE}" -a "${INITRAMFS_IMAGE_BUNDLE}" = "1" ]; then |
138 | mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${INITRAMFS_LINK_NAME}.bin ::${KERNEL_IMAGETYPE} | 138 | mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${INITRAMFS_LINK_NAME}.bin ::${KERNEL_IMAGETYPE} || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${INITRAMFS_LINK_NAME}.bin into boot.img" |
139 | else | 139 | else |
140 | mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} ::${KERNEL_IMAGETYPE} | 140 | mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} ::${KERNEL_IMAGETYPE} || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} into boot.img" |
141 | fi | 141 | fi |
142 | else | 142 | else |
143 | if [ ! -z "${INITRAMFS_IMAGE}" -a "${INITRAMFS_IMAGE_BUNDLE}" = "1" ]; then | 143 | if [ ! -z "${INITRAMFS_IMAGE}" -a "${INITRAMFS_IMAGE_BUNDLE}" = "1" ]; then |
144 | mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${INITRAMFS_LINK_NAME}.bin ::${SDIMG_KERNELIMAGE} | 144 | mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${INITRAMFS_LINK_NAME}.bin ::${SDIMG_KERNELIMAGE} || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${INITRAMFS_LINK_NAME}.bin into boot.img" |
145 | else | 145 | else |
146 | mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} ::${SDIMG_KERNELIMAGE} | 146 | mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} ::${SDIMG_KERNELIMAGE} || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} into boot.img" |
147 | fi | 147 | fi |
148 | fi | 148 | fi |
149 | 149 | ||
150 | if [ -n "${FATPAYLOAD}" ] ; then | 150 | if [ -n "${FATPAYLOAD}" ] ; then |
151 | echo "Copying payload into VFAT" | 151 | echo "Copying payload into VFAT" |
152 | for entry in ${FATPAYLOAD} ; do | 152 | for entry in ${FATPAYLOAD} ; do |
153 | # add the || true to stop aborting on vfat issues like not supporting .~lock files | 153 | # use bbwarn instead of bbfatal to stop aborting on vfat issues like not supporting .~lock files |
154 | mcopy -i ${WORKDIR}/boot.img -s -v ${IMAGE_ROOTFS}$entry :: || true | 154 | mcopy -v -i ${WORKDIR}/boot.img -s ${IMAGE_ROOTFS}$entry :: || bbwarn "mcopy cannot copy ${IMAGE_ROOTFS}$entry into boot.img" |
155 | done | 155 | done |
156 | fi | 156 | fi |
157 | 157 | ||
158 | # Add stamp file | 158 | # Add stamp file |
159 | echo "${IMAGE_NAME}" > ${WORKDIR}/image-version-info | 159 | echo "${IMAGE_NAME}" > ${WORKDIR}/image-version-info |
160 | mcopy -i ${WORKDIR}/boot.img -v ${WORKDIR}/image-version-info :: | 160 | mcopy -v -i ${WORKDIR}/boot.img ${WORKDIR}/image-version-info :: || bbfatal "mcopy cannot copy ${WORKDIR}/image-version-info into boot.img" |
161 | 161 | ||
162 | # Deploy vfat partition | 162 | # Deploy vfat partition |
163 | if [ "${SDIMG_VFAT_DEPLOY}" = "1" ]; then | 163 | if [ "${SDIMG_VFAT_DEPLOY}" = "1" ]; then |