From 501e07acd803df6f9264c4206b4b9529006f287a Mon Sep 17 00:00:00 2001 From: Anton Gerasimov Date: Thu, 30 Mar 2017 17:48:10 +0200 Subject: Merge from meta-agl-extra --- classes/sdcard_image-rpi-ota.bbclass | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'classes/sdcard_image-rpi-ota.bbclass') diff --git a/classes/sdcard_image-rpi-ota.bbclass b/classes/sdcard_image-rpi-ota.bbclass index cb0c597..f5c35a2 100644 --- a/classes/sdcard_image-rpi-ota.bbclass +++ b/classes/sdcard_image-rpi-ota.bbclass @@ -72,6 +72,8 @@ SDIMG_OTA = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.rpi-sdimg-ota" # Additional files and/or directories to be copied into the vfat partition from the IMAGE_ROOTFS. FATPAYLOAD ?= "" +IMAGEDATESTAMP = "${@time.strftime('%Y.%m.%d',time.gmtime())}" +IMAGE_CMD_rpi-sdimg-ota[vardepsexclude] += "IMAGEDATESTAMP" IMAGE_CMD_rpi-sdimg-ota[vardepsexclude] += "DATETIME" IMAGE_CMD_rpi-sdimg-ota () { @@ -123,8 +125,10 @@ IMAGE_CMD_rpi-sdimg-ota () { # Copy device tree overlays to dedicated folder mmd -i ${WORKDIR}/boot.img overlays for DTB in ${DT_OVERLAYS}; do - DTB_BASE_NAME=`basename ${DTB} .dtb` - mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTB_BASE_NAME}.dtb ::overlays/${DTB_BASE_NAME}.dtbo + DTB_EXT=${DTB##*.} + DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"` + + mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTB_BASE_NAME}.${DTB_EXT} ::overlays/${DTB_BASE_NAME}.${DTB_EXT} done fi @@ -145,6 +149,10 @@ IMAGE_CMD_rpi-sdimg-ota () { done fi + # Add stamp file + echo "${IMAGE_NAME}-${IMAGEDATESTAMP}" > ${WORKDIR}/image-version-info + mcopy -i ${WORKDIR}/boot.img -v ${WORKDIR}//image-version-info :: + # Burn Partitions sync dd if=${WORKDIR}/boot.img of=${SDIMG_OTA} conv=notrunc seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync @@ -171,6 +179,9 @@ IMAGE_CMD_rpi-sdimg-ota () { xz -k "${SDIMG_OTA}" ;; esac + + rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.rpi-sdimg-ota + ln -s ${IMAGE_NAME}.rootfs.rpi-sdimg-ota ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.rpi-sdimg-ota } ROOTFS_POSTPROCESS_COMMAND += " rpi_generate_sysctl_config ; " -- cgit v1.2.3-54-g00ecf