diff options
| author | Stefano Stabellini | 2020-04-14 13:38:10 -0700 |
|---|---|---|
| committer | Stefano Stabellini | 2020-04-14 15:13:01 -0700 |
| commit | 1ddba87493a1114011d4dcd76b08ee7e0775caea (patch) | |
| tree | 807480502e37f1e7bf933ed06ab0af5d878494e8 /scripts | |
| parent | 4f53c7af211f919f34651828b97cae84cd00d7e7 (diff) | |
Use stat -L instead of stat, file -L instead of file
Use stat -L and file -L so that the two tools follow symlinks correctly.
Also fix an error in check_file_type: the error function is called
cleanup_and_return_err, not clean_up_and_err_out.
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
Reviewed-by: Brian Woods <brian.woods@xilinx.com>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/disk_image | 18 | ||||
| -rw-r--r-- | scripts/uboot-script-gen | 8 |
2 files changed, 13 insertions, 13 deletions
diff --git a/scripts/disk_image b/scripts/disk_image index e085f43..892056d 100755 --- a/scripts/disk_image +++ b/scripts/disk_image @@ -88,22 +88,22 @@ check_depends source "$CFG_FILE" offset=$((2*1024*1024)) -_part1_size=`stat --printf="%s" $UBOOT_OUT/$XEN` -_part1_size=$(( $_part1_size + `stat --printf="%s" $UBOOT_OUT/$DOM0_KERNEL` )) -_part1_size=$(( $_part1_size + `stat --printf="%s" $UBOOT_OUT/$DEVICE_TREE` )) -_part1_size=$(( $_part1_size + `stat --printf="%s" $UBOOT_OUT/$UBOOT_SOURCE` )) -_part1_size=$(( $_part1_size + `stat --printf="%s" $UBOOT_OUT/$UBOOT_SCRIPT` )) +_part1_size=`stat -L --printf="%s" $UBOOT_OUT/$XEN` +_part1_size=$(( $_part1_size + `stat -L --printf="%s" $UBOOT_OUT/$DOM0_KERNEL` )) +_part1_size=$(( $_part1_size + `stat -L --printf="%s" $UBOOT_OUT/$DEVICE_TREE` )) +_part1_size=$(( $_part1_size + `stat -L --printf="%s" $UBOOT_OUT/$UBOOT_SOURCE` )) +_part1_size=$(( $_part1_size + `stat -L --printf="%s" $UBOOT_OUT/$UBOOT_SCRIPT` )) i=0 while test $i -lt $NUM_DOMUS do - _part1_size=$(( $_part1_size + `stat --printf="%s" $UBOOT_OUT/${DOMU_KERNEL[$i]}` )) + _part1_size=$(( $_part1_size + `stat -L --printf="%s" $UBOOT_OUT/${DOMU_KERNEL[$i]}` )) if test "${DOMU_RAMDISK[$i]}" then - _part1_size=$(( $_part1_size + `stat --printf="%s" $UBOOT_OUT/${DOMU_RAMDISK[$i]}` )) + _part1_size=$(( $_part1_size + `stat -L --printf="%s" $UBOOT_OUT/${DOMU_RAMDISK[$i]}` )) fi if test "${DOMU_PASSTHROUGH_DTB[$i]}" then - _part1_size=$(( $_part1_size + `stat --printf="%s" $UBOOT_OUT/${DOMU_PASSTHROUGH_DTB[$i]}` )) + _part1_size=$(( $_part1_size + `stat -L --printf="%s" $UBOOT_OUT/${DOMU_PASSTHROUGH_DTB[$i]}` )) fi i=$(( $i + 1 )) done @@ -117,7 +117,7 @@ echo PART1 size: "$_part1_size"MB if test "$DOM0_RAMDISK" then - _part2_size=`stat --printf="%s" $UBOOT_OUT/$DOM0_RAMDISK` + _part2_size=`stat -L --printf="%s" $UBOOT_OUT/$DOM0_RAMDISK` fi _part2_size=$(( $_part2_size + $offset - 1)) _part2_size=$(( $_part2_size & ~($offset - 1) )) diff --git a/scripts/uboot-script-gen b/scripts/uboot-script-gen index 9e81ad8..3e167b1 100644 --- a/scripts/uboot-script-gen +++ b/scripts/uboot-script-gen @@ -105,7 +105,7 @@ function device_tree_editing() function add_size() { local filename=$1 - local size=`stat --printf="%s" $filename` + local size=`stat -L --printf="%s" $filename` memaddr=$(( $memaddr + $size + $offset - 1)) memaddr=$(( $memaddr & ~($offset - 1) )) memaddr=`printf "0x%X\n" $memaddr` @@ -138,11 +138,11 @@ function check_file_type() type="executable\|data" fi - file $filename | grep "$type" &> /dev/null + file -L $filename | grep "$type" &> /dev/null if test $? != 0 then echo Wrong file type "$filename". It should be "$type", exiting. - clean_up_and_err_out + cleanup_and_return_err fi } @@ -157,7 +157,7 @@ function check_compressed_file_type() cleanup_and_return_err fi - file $filename | grep "gzip compressed data" &> /dev/null + file -L $filename | grep "gzip compressed data" &> /dev/null if test $? == 0 then local tmp=`mktemp` |