]> code.ossystems Code Review - meta-freescale.git/commitdiff
image_types_fsl.bbclass: Fix DeviceTree copy for FAT partition
authorOtavio Salvador <otavio@ossystems.com.br>
Wed, 23 Sep 2015 12:53:31 +0000 (09:53 -0300)
committerOtavio Salvador <otavio@ossystems.com.br>
Tue, 19 Apr 2016 18:03:20 +0000 (15:03 -0300)
The rootfs generation script now runs outside of the deploy directory
so the code need to use the full path for the installed files. This
fixes the rootfs generation process so the files are copied to the FAT
partition, allowing the system to boot.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Tested-by: Daiane Angolini <daiane.angolini@freescale.com>
classes/image_types_fsl.bbclass

index 331f739108c34c1b102b388c7c54ccc26f94fa81..dba2c1330def136d15327a0c17d78572e5b4e841 100644 (file)
@@ -169,9 +169,9 @@ generate_imx_sdcard () {
        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