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

sdcard_image-sunxi.bbclass: reverting to deploy dir instead of staging dir (resolves #81)

Browse Source 
To resolve the race condition described in #15,
a patch was introduced to use the kernel source from staging dir
rather than deploy dir.

After the reorganization of the kernel source location by
6a1ff0e7ea
this no longer works.

Reverting the previous patch,
and introducing explicit rootfs dependency instead.

Signed-off-by: Kristof Robot <krirobo@gmail.com>
This commit is contained in:
Kristof Robot 2015-02-01 13:15:44 +01:00
parent 5b875e911c
commit a27c9aa7e4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
classes/sdcard_image-sunxi.bbclass
View File

@ -38,7 +38,7 @@ IMAGE_DEPENDS_sunxi-sdimg += " \
sunxi-board-fex \ sunxi-board-fex \
" "
rootfs[depends] += "sunxi-board-fex:do_deploy" rootfs[depends] += "virtual/kernel:do_deploy sunxi-board-fex:do_deploy"
# SD card image name # SD card image name
SDIMG = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.sunxi-sdimg" SDIMG = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.sunxi-sdimg"
@ -67,7 +67,7 @@ IMAGE_CMD_sunxi-sdimg () {
# Create a vfat image with boot files # 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 }') 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 mkfs.vfat -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img $BOOT_BLOCKS
mcopy -i ${WORKDIR}/boot.img -s ${STAGING_DIR_HOST}/usr/src/kernel/${KERNEL_IMAGETYPE} ::uImage mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin ::uImage
if [ -e "${DEPLOY_DIR_IMAGE}/fex.bin" ] if [ -e "${DEPLOY_DIR_IMAGE}/fex.bin" ]
then then
mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/fex.bin ::script.bin mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/fex.bin ::script.bin