dany/meta-sunxi
1
0
Fork 0
mirror of https://github.com/linux-sunxi/meta-sunxi.git synced 2024-12-26 04:58:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

sdcard_image-sunxi.bbclass: fixing race condition with virtual/kernel (resolves #15)

Browse Source 
Fixing a race condition with virtual/kernel:do_deploy,
which needs to deploy the image before the IMAGE_CMD_sunxi-sdimg () code is being run
as part of image:do_rootfs, otherwise the following error would sometimes occur
when compiling with multiple threads (BB_NUMBER_THREADS=2):
"[..]/deploy/images/cubieboard2/uImage-cubieboard2.bin: No such file or directory"

Fixing this by using the kernel image in sysrootfs instead.

At the same time, also adding an explicit rootfs dependency on sunxi-board-fex:do_deploy because of
"${DEPLOY_DIR_IMAGE}/fex.bin", although this never seems to pose problems in practice.
This commit is contained in:
Kristof Robot 2013-12-19 10:06:55 +01:00
parent 92d1408c46
commit a248d37b35
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
classes/sdcard_image-sunxi.bbclass
View File

@ -35,6 +35,9 @@ IMAGE_DEPENDS_sunxi-sdimg += " \
virtual/bootloader \
sunxi-board-fex \
"
rootfs[depends] += "sunxi-board-fex:do_deploy"
# SD card image name
SDIMG = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.sunxi-sdimg"
@ -62,7 +65,7 @@ IMAGE_CMD_sunxi-sdimg () {
# Create a vfat image with boot files
BOOT_BLOCKS=$(LC_ALL=C parted -s ${SDIMG} unit b print | awk '/ 1 / { print substr($4, 1, length($4 -1)) / 512 /2 }')
mkfs.vfat -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img $BOOT_BLOCKS
mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin ::uImage
mcopy -i ${WORKDIR}/boot.img -s ${STAGING_DIR_HOST}/usr/src/kernel/${KERNEL_IMAGETYPE} ::uImage
if [ -e "${DEPLOY_DIR_IMAGE}/fex.bin" ]
then
mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/fex.bin ::script.bin