From 5de3243edf30df7a8b28ae14b45d8f70da5a9747 Mon Sep 17 00:00:00 2001 From: Vincent BENOIT Date: Thu, 4 May 2023 14:13:51 +0000 Subject: [PATCH] modification de la classe sd-img --- classes/sdcard_image-pengwyn.bbclass | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/classes/sdcard_image-pengwyn.bbclass b/classes/sdcard_image-pengwyn.bbclass index cfe05a8..c6f1845 100644 --- a/classes/sdcard_image-pengwyn.bbclass +++ b/classes/sdcard_image-pengwyn.bbclass @@ -68,8 +68,8 @@ SDIMG = "${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.sdimg" #SDIMG_VFAT = "${IMAGE_NAME}.vfat" #SDIMG_LINK_VFAT = "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.vfat" -# Specifies the command to create the image file for a specific image type, -# which corresponds to the value set in IMAGE_FSTYPES, (e.g. ext3, btrfs, and so forth). +# Specifies the command to create the image file for a specific image type, +# which corresponds to the value set in IMAGE_FSTYPES, (e.g. ext3, btrfs, and so forth). # When setting this variable, you should use an override for the associated type IMAGE_CMD:pengwyn-sdimg () { # Align partitions @@ -77,7 +77,7 @@ IMAGE_CMD:pengwyn-sdimg () { BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE_ALIGNED} - ${BOOT_SPACE_ALIGNED} % ${IMAGE_ROOTFS_ALIGNMENT}) SDIMG_SIZE=$(expr ${IMAGE_ROOTFS_ALIGNMENT} + ${BOOT_SPACE_ALIGNED} + $ROOTFS_SIZE) - echo "Creating filesystem with Boot partition ${BOOT_SPACE_ALIGNED} KiB and RootFS $ROOTFS_SIZE KiB" + echo "** PENGWYN ** Creating filesystem with Boot partition ${BOOT_SPACE_ALIGNED} KiB and RootFS $ROOTFS_SIZE KiB" # Initialize sdcard image file dd if=/dev/zero of=${SDIMG} bs=1024 count=0 seek=${SDIMG_SIZE} @@ -87,7 +87,7 @@ IMAGE_CMD:pengwyn-sdimg () { parted -s ${SDIMG} unit KiB mkpart primary fat32 ${IMAGE_ROOTFS_ALIGNMENT} $(expr ${BOOT_SPACE_ALIGNED} \+ ${IMAGE_ROOTFS_ALIGNMENT}) parted -s ${SDIMG} set 1 boot on # Create rootfs partition to the end of disk - parted -s ${SDIMG} -- unit KiB mkpart primary ext2 $(expr ${BOOT_SPACE_ALIGNED} \+ ${IMAGE_ROOTFS_ALIGNMENT}) -1s + parted -s ${SDIMG} -- unit KiB mkpart primary ext4 $(expr ${BOOT_SPACE_ALIGNED} \+ ${IMAGE_ROOTFS_ALIGNMENT}) -1s parted ${SDIMG} print # Create a vfat image with boot files @@ -115,11 +115,9 @@ IMAGE_CMD:pengwyn-sdimg () { # If SDIMG_ROOTFS_TYPE is a .xz file use xzcat if echo "${SDIMG_ROOTFS_TYPE}" | egrep -q "*\.xz" then - xzcat ${SDIMG_ROOTFS} | dd of=${SDIMG} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) + xzcat ${SDIMG_ROOTFS} | dd of=${SDIMG} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) else - echo "SCLE: SDIMG_ROOTFS: ${SDIMG_ROOTFS}" - echo "SCLE: SDIMG: ${SDIMG}" - dd if=${SDIMG_ROOTFS} of=${SDIMG} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) + dd if=${SDIMG_ROOTFS} of=${SDIMG} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) fi }