From 623eb86f258bab4ce7a70817ba668b83c1e1f3ef Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 15 Aug 2017 11:01:26 +0300 Subject: tegra: rootfs now defaults to ext4 also make sure variables are not expanded too early. Change-Id: I975fcdc103af94a7dbed7b5539de4451a460446a Reviewed-by: Mikko Gronoff --- classes/image_types_sdcard.bbclass | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/classes/image_types_sdcard.bbclass b/classes/image_types_sdcard.bbclass index 5bd86c2..37b1b61 100644 --- a/classes/image_types_sdcard.bbclass +++ b/classes/image_types_sdcard.bbclass @@ -52,16 +52,16 @@ IMAGE_DEPENDS_tegraflash_append = " parted-native:do_populate_sysroot" create_tegraflash_pkg_prepend() { # Create partition table SDCARD=${IMGDEPLOYDIR}/${IMAGE_NAME}.img - SDCARD_ROOTFS=${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.ext3 - SDCARD_SIZE=$(expr ${IMAGE_ROOTFS_ALIGNMENT} + $ROOTFS_SIZE + ${IMAGE_ROOTFS_ALIGNMENT}) + SDCARD_ROOTFS=${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.ext4 + SDCARD_SIZE=$(expr ${IMAGE_ROOTFS_ALIGNMENT} + ${ROOTFS_SIZE} + ${IMAGE_ROOTFS_ALIGNMENT}) - dd if=/dev/zero of=${SDCARD} bs=1 count=0 seek=$(expr 1024 \* ${SDCARD_SIZE}) + dd if=/dev/zero of=$SDCARD bs=1 count=0 seek=$(expr 1024 \* $SDCARD_SIZE) - parted -s ${SDCARD} mklabel gpt - parted -s ${SDCARD} unit KiB mkpart primary ${IMAGE_ROOTFS_ALIGNMENT} $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${ROOTFS_SIZE}) - parted ${SDCARD} print + parted -s $SDCARD mklabel gpt + parted -s $SDCARD unit KiB mkpart primary ${IMAGE_ROOTFS_ALIGNMENT} $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${ROOTFS_SIZE}) + parted $SDCARD print - dd if=${SDCARD_ROOTFS} of=${SDCARD} conv=notrunc,fsync seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) + dd if=$SDCARD_ROOTFS of=$SDCARD conv=notrunc,fsync seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) rm -f ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.img ln -s ${IMAGE_NAME}.img ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.img -- cgit v1.2.3-54-g00ecf