From 0da0fd65314f65f55e7c409f54e6875f6c6f8081 Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Fri, 9 Sep 2016 22:23:12 +1000 Subject: [PATCH 1/3] sdcard_image-sunxi.bbclass: change deployment dir to IMGDEPLOYIDR This fixes building images after OE-Core revision 6d969bacc718e21a5246d4da9bf9639dcae29b02. Signed-off-by: Jonathan Liu --- classes/sdcard_image-sunxi.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/sdcard_image-sunxi.bbclass b/classes/sdcard_image-sunxi.bbclass index 5f4bc7f..17c6aa5 100644 --- a/classes/sdcard_image-sunxi.bbclass +++ b/classes/sdcard_image-sunxi.bbclass @@ -27,7 +27,7 @@ IMAGE_ROOTFS_ALIGNMENT = "2048" # Use an uncompressed ext3 by default as rootfs SDIMG_ROOTFS_TYPE ?= "ext4" -SDIMG_ROOTFS = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.${SDIMG_ROOTFS_TYPE}" +SDIMG_ROOTFS = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.${SDIMG_ROOTFS_TYPE}" IMAGE_DEPENDS_sunxi-sdimg += " \ parted-native \ @@ -40,7 +40,7 @@ IMAGE_DEPENDS_sunxi-sdimg += " \ rootfs[depends] += "virtual/kernel:do_deploy" # SD card image name -SDIMG = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.sunxi-sdimg" +SDIMG = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.sunxi-sdimg" IMAGEDATESTAMP = "${@time.strftime('%Y.%m.%d',time.gmtime())}" From 26c32a32289411cbe720457e6a80866520ec0211 Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Fri, 9 Sep 2016 22:43:21 +1000 Subject: [PATCH 2/3] sdcard_image-sunxi.bbclass: fix copying device tree files not working The image class assumes the working directory is the directory containg the kernel and device tree files but this isn't always the case. Signed-off-by: Jonathan Liu --- classes/sdcard_image-sunxi.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/classes/sdcard_image-sunxi.bbclass b/classes/sdcard_image-sunxi.bbclass index 17c6aa5..09bff08 100644 --- a/classes/sdcard_image-sunxi.bbclass +++ b/classes/sdcard_image-sunxi.bbclass @@ -74,9 +74,9 @@ IMAGE_CMD_sunxi-sdimg () { if test -n "${KERNEL_DEVICETREE}"; then for DTS_FILE in ${KERNEL_DEVICETREE}; do DTS_BASE_NAME=`basename ${DTS_FILE} | awk -F "." '{print $1}'` - if [ -e "${KERNEL_IMAGETYPE}-${DTS_BASE_NAME}.dtb" ]; then - kernel_bin="`readlink ${KERNEL_IMAGETYPE}-${MACHINE}.bin`" - kernel_bin_for_dtb="`readlink ${KERNEL_IMAGETYPE}-${DTS_BASE_NAME}.dtb | sed "s,$DTS_BASE_NAME,${MACHINE},g;s,\.dtb$,.bin,g"`" + if [ -e ${DEPLOY_DIR_IMAGE}/"${KERNEL_IMAGETYPE}-${DTS_BASE_NAME}.dtb" ]; then + kernel_bin="`readlink ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin`" + kernel_bin_for_dtb="`readlink ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTS_BASE_NAME}.dtb | sed "s,$DTS_BASE_NAME,${MACHINE},g;s,\.dtb$,.bin,g"`" if [ $kernel_bin = $kernel_bin_for_dtb ]; then mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTS_BASE_NAME}.dtb ::/${DTS_BASE_NAME}.dtb fi From f6417032a066a57cef51eb3dad8b9c5deaeded40 Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Sun, 11 Sep 2016 22:17:14 +1000 Subject: [PATCH 3/3] sdcard_image-sunxi.bbclass: add vardepsexclude to fix taskhash mismatch IMAGEDATESTAMP may change while bitbake is running which can result in a taskhash mismatch error for do_image_sunxi_sdimg. Signed-off-by: Jonathan Liu --- classes/sdcard_image-sunxi.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/classes/sdcard_image-sunxi.bbclass b/classes/sdcard_image-sunxi.bbclass index 09bff08..5764e8c 100644 --- a/classes/sdcard_image-sunxi.bbclass +++ b/classes/sdcard_image-sunxi.bbclass @@ -43,6 +43,7 @@ rootfs[depends] += "virtual/kernel:do_deploy" SDIMG = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.sunxi-sdimg" IMAGEDATESTAMP = "${@time.strftime('%Y.%m.%d',time.gmtime())}" +IMAGE_CMD_sunxi-sdimg[vardepsexclude] += "IMAGEDATESTAMP" IMAGE_CMD_sunxi-sdimg () {