diff options
| author | Víctor Mayoral Vilches | 2021-04-23 17:36:12 -0700 |
|---|---|---|
| committer | Stefano Stabellini | 2021-05-17 14:51:00 -0700 |
| commit | 2deb09c3c157d1a3fbc8d4a60ebb76bfae3593ca (patch) | |
| tree | 72540634175385df8c10be2a1243f91aa58d3e13 /scripts/disk_image | |
| parent | 95ba62e9aeff32a7e00a4e7888b88ffa71fdd9d3 (diff) | |
Account for rootfs compression and total size
A heuristic was used in the previous implementation for simplicity (*2)
but when using bigger file systems size overflows.
This patch uncompresses the archive in an auxiliary folder and
calculates its total size in bytes instead.
Signed-off-by: Víctor Mayoral Vilches <v.mayoralv@gmail.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
Reviewed-by: Brian Woods <brian.woods@xilinx.com>
Diffstat (limited to 'scripts/disk_image')
| -rwxr-xr-x | scripts/disk_image | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/scripts/disk_image b/scripts/disk_image index 8bc1312..953bf0d 100755 --- a/scripts/disk_image +++ b/scripts/disk_image @@ -3,7 +3,7 @@ # This helps to see what is going on set -e -PROG_REQ=( kpartx mkfs.ext4 losetup sgdisk readlink ) +PROG_REQ=( kpartx mkfs.ext4 losetup sgdisk readlink awk ) function check_depends() { @@ -106,7 +106,25 @@ function generate_domU_configs() function add_partition() { local rootfs="$1" - _part_size=`stat -L --printf="%s" $rootfs` + local aux_dir=$(mktemp -d) + + cd "$aux_dir" + + if [[ $rootfs = *.cpio.gz ]] + then + cat "${UBOOT_OUT_ABS}/$rootfs" | gunzip | cpio -id + _part_size=$(du -sb| awk '{print $1}') + elif [[ $rootfs = *.tar.gz ]] + then + tar -xf "${UBOOT_OUT_ABS}/$rootfs" + _part_size=$(du -sb| awk '{print $1}') + else + echo "Ignoring $rootfs: unsupported file format. Use cpio.gz or tar.gz." + fi + + cd - + rm -rf "$aux_dir" + _part_size=$(( $_part_size + $offset - 1)) _part_size=$(( $_part_size & ~($offset - 1) )) # account for gzip compression @@ -141,7 +159,7 @@ function write_rootfs() cat "${UBOOT_OUT_ABS}/$rootfs" | gunzip | cpio -id elif [[ $rootfs = *.tar.gz ]] then - tar xvzf "${UBOOT_OUT_ABS}/$rootfs" + tar -xf "${UBOOT_OUT_ABS}/$rootfs" else echo "Ignoring $rootfs: unsupported file format. Use cpio.gz or tar.gz." fi @@ -294,7 +312,7 @@ _npart=1 if test "$DOM0_ROOTFS" then - add_partition "$UBOOT_OUT/$DOM0_ROOTFS" + add_partition "$DOM0_ROOTFS" fi i=0 @@ -302,7 +320,7 @@ while test $i -lt $NUM_DOMUS do if test "${DOMU_ROOTFS[$i]}" then - add_partition "$UBOOT_OUT/${DOMU_ROOTFS[$i]}" + add_partition "${DOMU_ROOTFS[$i]}" fi i=$(( $i + 1 )) done |